summaryrefslogtreecommitdiff
authorllornkcor <llornkcor>2003-04-21 23:58:24 (UTC)
committer llornkcor <llornkcor>2003-04-21 23:58:24 (UTC)
commit2d4cf8a85edc83b72855854b0bd337d2993df95b (patch) (side-by-side diff)
treea4d1909771e181a984b00cc573669de0985ac179
parente951446d52d2a89dd919b1665b034516567384ee (diff)
downloadopie-2d4cf8a85edc83b72855854b0bd337d2993df95b.zip
opie-2d4cf8a85edc83b72855854b0bd337d2993df95b.tar.gz
opie-2d4cf8a85edc83b72855854b0bd337d2993df95b.tar.bz2
no defaults in constructors
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opierec/device.h2
-rw-r--r--noncore/multimedia/opierec/helpwindow.h2
-rw-r--r--noncore/multimedia/opierec/qtrec.h2
-rw-r--r--noncore/multimedia/opierec/wavFile.h4
4 files changed, 5 insertions, 5 deletions
diff --git a/noncore/multimedia/opierec/device.h b/noncore/multimedia/opierec/device.h
index c9a7491..2d4d2fc 100644
--- a/noncore/multimedia/opierec/device.h
+++ b/noncore/multimedia/opierec/device.h
@@ -1,45 +1,45 @@
#ifndef DEVICE_H
#define DEVICE_H
#include <qobject.h>
#include <sys/soundcard.h>
class Device : public QObject {
Q_OBJECT
public:
- Device( QObject * parent=0, const char * dspStr=0, const char * mixerStr=0, bool record=false );
+ Device( QObject * parent, const char * dspStr, const char * mixerStr, bool record );
~Device() {};
bool closeDevice( bool);
int getChannels();
int getFormat();
int getInVolume();
int getOutVolume();
int getRate();
int getRes();
int sd; //sound descriptor
void changedInVolume(int);
void changedOutVolume(int);
bool openDsp();
int getDeviceFormat();
int getDeviceRate();
int getDeviceBits();
int getDeviceChannels();
int getDeviceFragSize();
bool setFragSize(int);
bool setDeviceChannels(int);
bool setDeviceRate(int);
bool setDeviceFormat(int);
bool reset();
private:
int devRes, devCh, devRate, devForm, flags;
char *dspstr, *mixstr;
bool selectMicInput();
int openDevice( int );
private slots:
protected:
};
#endif
diff --git a/noncore/multimedia/opierec/helpwindow.h b/noncore/multimedia/opierec/helpwindow.h
index 76b672a..bd8fbdf 100644
--- a/noncore/multimedia/opierec/helpwindow.h
+++ b/noncore/multimedia/opierec/helpwindow.h
@@ -1,62 +1,62 @@
/****************************************************************************
** $Id$
**
** Copyright (C) 1992-2000 Trolltech AS. All rights reserved.
**
** This file is part of an example program for Qt. This example
** program may be used, distributed and modified without limitation.
**
*****************************************************************************/
#ifndef HELPWINDOW_H
#define HELPWINDOW_H
#include <qmainwindow.h>
#include <qtextbrowser.h>
#include <qstringlist.h>
#include <qmap.h>
#include <qdir.h>
#include <qevent.h>
class QComboBox;
class QPopupMenu;
class HelpWindow : public QMainWindow
{
Q_OBJECT
public:
- HelpWindow( const QString& home_, const QString& path, QWidget* parent = 0, const char *name=0 );
+ HelpWindow( const QString& home_, const QString& path, QWidget* parent, const char *name );
~HelpWindow();
private slots:
void addBookmark();
void bookmChosen( int );
void histChosen( int );
void newWindow();
void openFile();
void pathSelected( const QString & );
void print();
void setBackwardAvailable( bool );
void setForwardAvailable( bool );
void textChanged();
private:
QTextBrowser* browser;
QComboBox *pathCombo;
int backwardId, forwardId;
QString selectedURL;
QStringList history, bookmarks;
QMap<int, QString> mHistory, mBookmarks;
QPopupMenu *hist, *bookm;
void readHistory();
void readBookmarks();
};
#endif
diff --git a/noncore/multimedia/opierec/qtrec.h b/noncore/multimedia/opierec/qtrec.h
index d0623d0..1a51151 100644
--- a/noncore/multimedia/opierec/qtrec.h
+++ b/noncore/multimedia/opierec/qtrec.h
@@ -1,185 +1,185 @@
/****************************************************************************
** Created: Thu Jan 17 11:19:45 2002
copyright 2002 by L.J. Potter ljp@llornkcor.com
****************************************************************************/
#ifndef QTREC_H
#define QTREC_H
#define VERSION 20021202
#include <qpe/ir.h>
#include <iostream.h>
#include <qfile.h>
#include <qimage.h>
#include <qlineedit.h>
#include <qpixmap.h>
#include <qvariant.h>
#include <qwidget.h>
#include <stdio.h>
#include <stdlib.h>
#include "device.h"
#include "wavFile.h"
class QButtonGroup;
class QCheckBox;
class QComboBox;
class QGridLayout;
class QGroupBox;
class QHBoxLayout;
class QIconView;
class QIconViewItem;
class QLabel;
class QLabel;
class QListView;
class QListViewItem;
class QPushButton;
class QSlider;
class QTabWidget;
class QTimer;
class QVBoxLayout;
class QLineEdit;
#define MAX_TRACKS 2
//#define BUFSIZE 4096
// #define BUFSIZE 8182 //Z default buffer size
#define BUFSIZE 1024
//#define BUFSIZE 2048
#define FRAGSIZE 0x7fff000A;
#define WAVE_FORMAT_DVI_ADPCM (0x0011)
#define WAVE_FORMAT_PCM (0x0001)
//AFMT_IMA_ADPCM
class QtRec : public QWidget
{
Q_OBJECT
public:
- QtRec( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
+ QtRec( QWidget* parent, const char* name, WFlags fl );
~QtRec();
QSlider *OutputSlider,*InputSlider;
public slots:
private:
// int fragment;
int fd1;
int secCount;
QString timeString;
QLineEdit *renameBox;
QGroupBox* GroupBox1;
QString currentFile;
QString date, currentFileName, tmpFileName;
QTimer *t_timer;
bool needsStereoOut, paused, playing;
bool useTmpFile, autoMute;
bool eventFilter( QObject * , QEvent * );
void okRename();
void cancelRename();
QString getStorage(const QString &);
bool rec();
int getCurrentSizeLimit();
long checkDiskSpace(const QString &);
void doMute(bool);
void errorStop();
void fillDirectoryCombo();
void getInVol();
void getOutVol();
void init();
void initConfig();
void initConnections();
void selectItemByName(const QString &);
void setRecordButton(bool);
void start();
void stop();
void timerEvent( QTimerEvent *e );
private slots:
void FastforwardPressed();
void FastforwardReleased();
void changeDirCombo(int);
void changeSizeLimitCombo(int);
void changeTimeSlider(int);
void changebitrateCombo(int);
void changedInVolume();
void changedOutVolume();
void changesamplerateCombo(int);
void cleanUp();
void compressionSelected(bool);
void deleteSound();
void doBeam();
void doMenuPlay();
void doMicMuting(bool);
void doPlayBtn();
void doRename();
void doVolMuting(bool);
void forwardTimerTimeout();
void itClick(QListViewItem *item);
void listPressed(int, QListViewItem *, const QPoint&, int);
void newSound();
void rewindPressed();
void rewindReleased();
void rewindTimerTimeout();
void slotAutoMute(bool);
void thisTab(QWidget*);
void timeSliderPressed();
void timeSliderReleased();
void timerBreak();
/* void changedOutVolume(int); */
/* void changedInVolume(int); */
protected:
Device *soundDevice;
WavFile *wavFile;
QButtonGroup *ButtonGroup1;
QCheckBox *outMuteCheckBox, *inMuteCheckBox, *compressionCheckBox, *autoMuteCheckBox;
QComboBox* sampleRateComboBox, * bitRateComboBox, *directoryComboBox, *sizeLimitCombo;
QHBoxLayout* Layout12;
QHBoxLayout* Layout13;
QHBoxLayout* Layout14;
QHBoxLayout* Layout16;
QHBoxLayout* Layout17;
QHBoxLayout* Layout19;
QIconView *IconView1;
QLabel *NewSoundLabel,*playLabel2;
QLabel *TextLabel3, *TextLabel1, *TextLabel2;
QListView *ListView1;
QPushButton *Stop_PushButton, *Play_PushButton, *Rec_PushButton, *NewSoundButton, *deleteSoundButton, *toBeginningButton, *toEndButton;
QString recDir;
QTabWidget *TabWidget;
QTimer *t, *rewindTimer, *forwardTimer;
QVBoxLayout* Layout15;
QVBoxLayout* Layout15b;
QVBoxLayout* Layout18;
QWidget *tab, *tab_2, *tab_3, *tab_4, *tab_5;
int sliderPos, total;
// short inbuffer[BUFSIZE], outbuffer[BUFSIZE];
// unsigned short unsigned_inbuffer[BUFSIZE], unsigned_outbuffer[BUFSIZE];
QGroupBox *sampleGroup, *bitGroup, *dirGroup, *sizeGroup;
/* short inbuffer[65536], outbuffer[65536]; */
/* unsigned short unsigned_inbuffer[65536], unsigned_outbuffer[65536]; */
bool doPlay();
bool openPlayFile();
bool setUpFile();
bool setupAudio( bool b);
void endPlaying();
void endRecording();
void fileBeamFinished( Ir *ir);
void initIconView();
void keyPressEvent( QKeyEvent *e);
void keyReleaseEvent( QKeyEvent *e);
void receive( const QCString &, const QByteArray & );
void showListMenu(QListViewItem * );
// void quickRec();
};
#endif // QTREC_H
diff --git a/noncore/multimedia/opierec/wavFile.h b/noncore/multimedia/opierec/wavFile.h
index 51366ec..53740e0 100644
--- a/noncore/multimedia/opierec/wavFile.h
+++ b/noncore/multimedia/opierec/wavFile.h
@@ -1,56 +1,56 @@
//wavFile.h
#ifndef WAVFILE_H
#define WAVFILE_H
#include <qobject.h>
#include <sys/soundcard.h>
#include <qfile.h>
#include <qstring.h>
typedef struct {
char riffID[4];
unsigned long riffLen;
char wavID[4];
char fmtID[4];
unsigned long fmtLen;
unsigned short fmtTag;
unsigned short nChannels;
unsigned long sampleRate;
unsigned long avgBytesPerSec;
unsigned short nBlockAlign;
unsigned short bitsPerSample;
char dataID[4];
unsigned long dataLen;
} wavhdr;
class WavFile : public QObject {
Q_OBJECT
public:
- WavFile( QObject * parent=0,const QString &fileName=0, bool newFile=true, int sampleRate = 0,
- int channels = 0, int resolution = 0, int format=0);
+ WavFile( QObject * parent,const QString &fileName, bool newFile, int sampleRate,
+ int channels , int resolution, int format);
~WavFile();
wavhdr hdr;
bool adjustHeaders(int fd, int total);
QString currentFileName;
QString trackName();
QFile track;
int wavHandle();
int getFormat();
int getResolution();
int getSampleRate();
int getNumberSamples();
bool isTempFile();
int openFile(const QString &);
bool newFile();
void closeFile();
private:
int wavFormat, wavChannels, wavResolution, wavSampleRate, wavNumberSamples;
bool useTmpFile;
bool setWavHeader(int fd, wavhdr *hdr);
int parseWavHeader(int fd);
};
#endif