summaryrefslogtreecommitdiff
path: root/noncore/multimedia/opierec/qtrec.cpp
Side-by-side diff
Diffstat (limited to 'noncore/multimedia/opierec/qtrec.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opierec/qtrec.cpp121
1 files changed, 28 insertions, 93 deletions
diff --git a/noncore/multimedia/opierec/qtrec.cpp b/noncore/multimedia/opierec/qtrec.cpp
index 6793b4e..e827083 100644
--- a/noncore/multimedia/opierec/qtrec.cpp
+++ b/noncore/multimedia/opierec/qtrec.cpp
@@ -5,3 +5,3 @@
****************************************************************************/
-#define DEV_VERSION
+//#define DEV_VERSION
@@ -65,31 +65,2 @@ static int deviceBitRates[] = { 8, 16, -1 };
-#if defined(QT_QWS_SL5XXX)
-///#if defined(QT_QWS_EBX)
-
-#define DSPSTROUT "/dev/dsp"
-#define DSPSTRMIXEROUT "/dev/mixer"
-
-#ifdef SHARP
-#define DSPSTRIN "/dev/dsp1"
-#define DSPSTRMIXERIN "/dev/mixer1"
-#else
-#define DSPSTRIN "/dev/dsp"
-#define DSPSTRMIXERIN "/dev/mixer"
-#endif
-
-#else
-
-#ifdef QT_QWS_DEVFS
-#define DSPSTROUT "/dev/sound/dsp"
-#define DSPSTRIN "/dev/sound/dsp"
-#define DSPSTRMIXERIN "/dev/sound/mixer"
-#define DSPSTRMIXEROUT "/dev/sound/mixer"
-#else
-#define DSPSTROUT "/dev/dsp"
-#define DSPSTRIN "/dev/dsp"
-#define DSPSTRMIXERIN "/dev/mixer"
-#define DSPSTRMIXEROUT "/dev/mixer"
-#endif
-
-#endif
@@ -195,4 +166,4 @@ void quickRec()
- printf("%d, bytes %d,total %d\r",number, bytesWritten, total);
- fflush(stdout);
+ printf("%d, bytes %d,total %d\r", number, bytesWritten, total);
+ fflush(stdout);
@@ -245,4 +216,4 @@ void quickRec()
timeSlider->setValue( total);
- printf("%d, bytes %d,total %d\r",number, bytesWritten , total);
- fflush(stdout);
+ printf("%d, bytes %d,total %d\r",number, bytesWritten , total);
+ fflush(stdout);
@@ -298,2 +269,3 @@ void quickRec()
}
+ printf("\n");
} /// END quickRec()
@@ -452,10 +424,3 @@ QtRec::QtRec( QWidget* parent, const char* name, WFlags fl )
- soundDevice = new Device( this,
- hwcfg.readEntry( "Audio",DSPSTROUT),
- hwcfg.readEntry( "Mixer",DSPSTRMIXEROUT), false);
-// soundDevice = new Device( this, hwcfg.readEntry( "Audio","hw:0"), hwcfg.readEntry( "Mixer","hw:0"), false);
-
-// soundDevice->setDeviceFormat(AFMT_S16_LE);
-// soundDevice->setDeviceChannels(1);
-// soundDevice->setDeviceRate( 22050);
+ soundDevice = new Device( this, false); //open play
@@ -506,3 +471,3 @@ void QtRec::init() {
stopped = true;
- setCaption( tr( "OpieRecord " ) + QString::number(VERSION) );
+ setCaption( tr( "OpieRecord " ));
QGridLayout *layout = new QGridLayout( this );
@@ -578,17 +543,6 @@ void QtRec::init() {
ListView1->addColumn( tr( "Name" ) );
-// ListView1->setColumnWidth( 0, 140);
ListView1->setSorting( 1, false);
ListView1->addColumn( tr( "Time" ) ); //in seconds
-// ListView1->setColumnWidth( 1, -1);
-// ListView1->addColumn( tr("Location") );
-// ListView1->setColumnWidth( 2, -1);
-// ListView1->addColumn( tr("Date") );
-// ListView1->setColumnWidth( 3, -1);
ListView1->setColumnWidthMode(0, QListView::Maximum);
-// ListView1->setColumnWidthMode(1, QListView::Maximum);
-
-// ListView1->setColumnWidthMode( 0, QListView::Manual);
ListView1->setColumnAlignment( 1, QListView::AlignCenter);
-// ListView1->setColumnAlignment( 2, QListView::AlignRight);
-// ListView1->setColumnAlignment( 3, QListView::AlignLeft);
ListView1->setAllColumnsShowFocus( true );
@@ -610,3 +564,2 @@ void QtRec::init() {
sampleRateComboBox->setGeometry( QRect( 10, 20, 80, 25 ) );
-//#ifndef QT_QWS_EBX
QString s;
@@ -719,5 +672,3 @@ void QtRec::init() {
-
waveform = new Waveform( this, "waveform" );
-// waveform->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5, (QSizePolicy::SizeType)3, waveform->sizePolicy().hasHeightForWidth() ) );
waveform->setMinimumSize( QSize( 0, 50 ) );
@@ -729,3 +680,2 @@ void QtRec::init() {
void QtRec::initIconView() {
- owarn << "initIconView" << oendl;
ListView1->clear();
@@ -737,3 +687,3 @@ void QtRec::initIconView() {
int nFiles = cfg.readNumEntry("NumberofFiles",0);
- owarn << "init number of files " << nFiles << "" << oendl;
+// owarn << "init number of files " << nFiles << "" << oendl;
@@ -754,3 +704,3 @@ void QtRec::initIconView() {
if( info.exists()) {
- owarn << "new item " << temp << oendl;
+// owarn << "new item " << temp << oendl;
item = new QListViewItem( ListView1, temp, fileS /*, mediaLocation, fileDate*/);
@@ -858,3 +808,3 @@ void QtRec::initConfig() {
void QtRec::stop() {
- owarn << "STOP" << oendl;
+// owarn << "STOP" << oendl;
setRecordButton(false);
@@ -1063,6 +1013,2 @@ bool QtRec::setupAudio( bool b) {
flags = O_WRONLY;
- Config hwcfg("OpieRec");
- hwcfg.setGroup("Hardware");
- dspString = hwcfg.readEntry( "Audio", DSPSTROUT);
- mixerString = hwcfg.readEntry( "Mixer", DSPSTRMIXEROUT);
recording = false;
@@ -1100,6 +1046,2 @@ bool QtRec::setupAudio( bool b) {
// flags= O_RDONLY;
- Config hwcfg("OpieRec");
- hwcfg.setGroup("Hardware");
- dspString = hwcfg.readEntry( "Audio", DSPSTRIN);
- mixerString = hwcfg.readEntry( "Mixer", DSPSTRMIXERIN);
recording = true;
@@ -1109,6 +1051,6 @@ bool QtRec::setupAudio( bool b) {
odebug << "<<<<<<<<<<<<<<<<<<<open dsp " << filePara.sampleRate << " " << filePara.channels << " " << sampleformat << "" << oendl;
- owarn << "change waveform settings" << oendl;
+// owarn << "change waveform settings" << oendl;
waveform->changeSettings( filePara.sampleRate, filePara.channels );
- soundDevice = new Device( this, dspString, mixerString, b);
+ soundDevice = new Device( this, b); //open rec
// soundDevice->openDsp();
@@ -1283,9 +1225,9 @@ void QtRec::deleteSound() {
return;
-#ifndef DEV_VERSION
- switch ( QMessageBox::warning(this,tr("Delete"),
- tr("Do you really want to <font size=+2><B>DELETE</B></font>\nthe selected file?"),
- tr("Yes"),tr("No"),0,1,1) ) {
- case 0:
-#endif
- {
+// #ifndef DEV_VERSION
+// switch ( QMessageBox::warning(this,tr("Delete"),
+// tr("Do you really want to <font size=+2><B>DELETE</B></font>\nthe selected file?"),
+// tr("Yes"),tr("No"),0,1,1) ) {
+// case 0:
+// #endif
+ // {
QString file = ListView1->currentItem()->text(0);
@@ -1322,8 +1264,3 @@ void QtRec::deleteSound() {
update();
- }
-#ifndef DEV_VERSION
- };
-#endif
- setCaption( tr( "OpieRecord " ) + QString::number(VERSION) );
-
+ setCaption( tr( "OpieRecord " ));
}
@@ -1445,2 +1382,3 @@ void QtRec::keyReleaseEvent( QKeyEvent *e) {
void QtRec::endRecording() {
+
monitoring = false;
@@ -1505,2 +1443,4 @@ void QtRec::endRecording() {
selectItemByName( currentFile);
+ setCaption( tr( "OpieRecord " ));
+
}
@@ -1537,3 +1477,3 @@ void QtRec::endPlaying() {
killTimers();
- owarn << "reset slider" << oendl;
+// owarn << "reset slider" << oendl;
timeSlider->setValue(0);
@@ -1570,3 +1510,3 @@ bool QtRec::openPlayFile() {
monitoring = false;
- setCaption( tr( "OpieRecord " ) + QString::number(VERSION) );
+ setCaption( tr( "OpieRecord " ));
QMessageBox::message(tr("Note"), tr("Could not open audio file.\n")
@@ -1587,3 +1527,3 @@ bool QtRec::openPlayFile() {
- owarn << "seconds " << sec << "" << oendl;
+// owarn << "seconds " << sec << "" << oendl;
@@ -1604,3 +1544,3 @@ void QtRec::listPressed( int mouse, QListViewItem *item, const QPoint &, int ) {
currentFile = item->text(0);
- setCaption( "OpieRecord " + currentFile);
+// setCaption( "OpieRecord " + currentFile);
}
@@ -1854,7 +1794,2 @@ void QtRec::timerEvent( QTimerEvent * ) {
QString timeString;
-#ifdef DEV_VERSION
- QString msg;
- msg.sprintf("%d, %d, %d", filePara.sampleRate, filePara.channels, filePara.resolution);
- setCaption( msg +" :: "+QString::number(secCount));
-#endif