Diffstat (limited to 'noncore/multimedia/opierec/qtrec.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/multimedia/opierec/qtrec.cpp | 113 |
1 files changed, 24 insertions, 89 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 @@ | |||
5 | ****************************************************************************/ | 5 | ****************************************************************************/ |
6 | #define DEV_VERSION | 6 | //#define DEV_VERSION |
7 | 7 | ||
@@ -65,31 +65,2 @@ static int deviceBitRates[] = { 8, 16, -1 }; | |||
65 | 65 | ||
66 | #if defined(QT_QWS_SL5XXX) | ||
67 | ///#if defined(QT_QWS_EBX) | ||
68 | |||
69 | #define DSPSTROUT "/dev/dsp" | ||
70 | #define DSPSTRMIXEROUT "/dev/mixer" | ||
71 | |||
72 | #ifdef SHARP | ||
73 | #define DSPSTRIN "/dev/dsp1" | ||
74 | #define DSPSTRMIXERIN "/dev/mixer1" | ||
75 | #else | ||
76 | #define DSPSTRIN "/dev/dsp" | ||
77 | #define DSPSTRMIXERIN "/dev/mixer" | ||
78 | #endif | ||
79 | |||
80 | #else | ||
81 | |||
82 | #ifdef QT_QWS_DEVFS | ||
83 | #define DSPSTROUT "/dev/sound/dsp" | ||
84 | #define DSPSTRIN "/dev/sound/dsp" | ||
85 | #define DSPSTRMIXERIN "/dev/sound/mixer" | ||
86 | #define DSPSTRMIXEROUT "/dev/sound/mixer" | ||
87 | #else | ||
88 | #define DSPSTROUT "/dev/dsp" | ||
89 | #define DSPSTRIN "/dev/dsp" | ||
90 | #define DSPSTRMIXERIN "/dev/mixer" | ||
91 | #define DSPSTRMIXEROUT "/dev/mixer" | ||
92 | #endif | ||
93 | |||
94 | #endif | ||
95 | 66 | ||
@@ -298,2 +269,3 @@ void quickRec() | |||
298 | } | 269 | } |
270 | printf("\n"); | ||
299 | } /// END quickRec() | 271 | } /// END quickRec() |
@@ -452,10 +424,3 @@ QtRec::QtRec( QWidget* parent, const char* name, WFlags fl ) | |||
452 | 424 | ||
453 | soundDevice = new Device( this, | 425 | soundDevice = new Device( this, false); //open play |
454 | hwcfg.readEntry( "Audio",DSPSTROUT), | ||
455 | hwcfg.readEntry( "Mixer",DSPSTRMIXEROUT), false); | ||
456 | // soundDevice = new Device( this, hwcfg.readEntry( "Audio","hw:0"), hwcfg.readEntry( "Mixer","hw:0"), false); | ||
457 | |||
458 | // soundDevice->setDeviceFormat(AFMT_S16_LE); | ||
459 | // soundDevice->setDeviceChannels(1); | ||
460 | // soundDevice->setDeviceRate( 22050); | ||
461 | 426 | ||
@@ -506,3 +471,3 @@ void QtRec::init() { | |||
506 | stopped = true; | 471 | stopped = true; |
507 | setCaption( tr( "OpieRecord " ) + QString::number(VERSION) ); | 472 | setCaption( tr( "OpieRecord " )); |
508 | QGridLayout *layout = new QGridLayout( this ); | 473 | QGridLayout *layout = new QGridLayout( this ); |
@@ -578,17 +543,6 @@ void QtRec::init() { | |||
578 | ListView1->addColumn( tr( "Name" ) ); | 543 | ListView1->addColumn( tr( "Name" ) ); |
579 | // ListView1->setColumnWidth( 0, 140); | ||
580 | ListView1->setSorting( 1, false); | 544 | ListView1->setSorting( 1, false); |
581 | ListView1->addColumn( tr( "Time" ) ); //in seconds | 545 | ListView1->addColumn( tr( "Time" ) ); //in seconds |
582 | // ListView1->setColumnWidth( 1, -1); | ||
583 | // ListView1->addColumn( tr("Location") ); | ||
584 | // ListView1->setColumnWidth( 2, -1); | ||
585 | // ListView1->addColumn( tr("Date") ); | ||
586 | // ListView1->setColumnWidth( 3, -1); | ||
587 | ListView1->setColumnWidthMode(0, QListView::Maximum); | 546 | ListView1->setColumnWidthMode(0, QListView::Maximum); |
588 | // ListView1->setColumnWidthMode(1, QListView::Maximum); | ||
589 | |||
590 | // ListView1->setColumnWidthMode( 0, QListView::Manual); | ||
591 | ListView1->setColumnAlignment( 1, QListView::AlignCenter); | 547 | ListView1->setColumnAlignment( 1, QListView::AlignCenter); |
592 | // ListView1->setColumnAlignment( 2, QListView::AlignRight); | ||
593 | // ListView1->setColumnAlignment( 3, QListView::AlignLeft); | ||
594 | ListView1->setAllColumnsShowFocus( true ); | 548 | ListView1->setAllColumnsShowFocus( true ); |
@@ -610,3 +564,2 @@ void QtRec::init() { | |||
610 | sampleRateComboBox->setGeometry( QRect( 10, 20, 80, 25 ) ); | 564 | sampleRateComboBox->setGeometry( QRect( 10, 20, 80, 25 ) ); |
611 | //#ifndef QT_QWS_EBX | ||
612 | QString s; | 565 | QString s; |
@@ -719,5 +672,3 @@ void QtRec::init() { | |||
719 | 672 | ||
720 | |||
721 | waveform = new Waveform( this, "waveform" ); | 673 | waveform = new Waveform( this, "waveform" ); |
722 | // waveform->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5, (QSizePolicy::SizeType)3, waveform->sizePolicy().hasHeightForWidth() ) ); | ||
723 | waveform->setMinimumSize( QSize( 0, 50 ) ); | 674 | waveform->setMinimumSize( QSize( 0, 50 ) ); |
@@ -729,3 +680,2 @@ void QtRec::init() { | |||
729 | void QtRec::initIconView() { | 680 | void QtRec::initIconView() { |
730 | owarn << "initIconView" << oendl; | ||
731 | ListView1->clear(); | 681 | ListView1->clear(); |
@@ -737,3 +687,3 @@ void QtRec::initIconView() { | |||
737 | int nFiles = cfg.readNumEntry("NumberofFiles",0); | 687 | int nFiles = cfg.readNumEntry("NumberofFiles",0); |
738 | owarn << "init number of files " << nFiles << "" << oendl; | 688 | // owarn << "init number of files " << nFiles << "" << oendl; |
739 | 689 | ||
@@ -754,3 +704,3 @@ void QtRec::initIconView() { | |||
754 | if( info.exists()) { | 704 | if( info.exists()) { |
755 | owarn << "new item " << temp << oendl; | 705 | // owarn << "new item " << temp << oendl; |
756 | item = new QListViewItem( ListView1, temp, fileS /*, mediaLocation, fileDate*/); | 706 | item = new QListViewItem( ListView1, temp, fileS /*, mediaLocation, fileDate*/); |
@@ -858,3 +808,3 @@ void QtRec::initConfig() { | |||
858 | void QtRec::stop() { | 808 | void QtRec::stop() { |
859 | owarn << "STOP" << oendl; | 809 | // owarn << "STOP" << oendl; |
860 | setRecordButton(false); | 810 | setRecordButton(false); |
@@ -1063,6 +1013,2 @@ bool QtRec::setupAudio( bool b) { | |||
1063 | flags = O_WRONLY; | 1013 | flags = O_WRONLY; |
1064 | Config hwcfg("OpieRec"); | ||
1065 | hwcfg.setGroup("Hardware"); | ||
1066 | dspString = hwcfg.readEntry( "Audio", DSPSTROUT); | ||
1067 | mixerString = hwcfg.readEntry( "Mixer", DSPSTRMIXEROUT); | ||
1068 | recording = false; | 1014 | recording = false; |
@@ -1100,6 +1046,2 @@ bool QtRec::setupAudio( bool b) { | |||
1100 | // flags= O_RDONLY; | 1046 | // flags= O_RDONLY; |
1101 | Config hwcfg("OpieRec"); | ||
1102 | hwcfg.setGroup("Hardware"); | ||
1103 | dspString = hwcfg.readEntry( "Audio", DSPSTRIN); | ||
1104 | mixerString = hwcfg.readEntry( "Mixer", DSPSTRMIXERIN); | ||
1105 | recording = true; | 1047 | recording = true; |
@@ -1109,6 +1051,6 @@ bool QtRec::setupAudio( bool b) { | |||
1109 | odebug << "<<<<<<<<<<<<<<<<<<<open dsp " << filePara.sampleRate << " " << filePara.channels << " " << sampleformat << "" << oendl; | 1051 | odebug << "<<<<<<<<<<<<<<<<<<<open dsp " << filePara.sampleRate << " " << filePara.channels << " " << sampleformat << "" << oendl; |
1110 | owarn << "change waveform settings" << oendl; | 1052 | // owarn << "change waveform settings" << oendl; |
1111 | waveform->changeSettings( filePara.sampleRate, filePara.channels ); | 1053 | waveform->changeSettings( filePara.sampleRate, filePara.channels ); |
1112 | 1054 | ||
1113 | soundDevice = new Device( this, dspString, mixerString, b); | 1055 | soundDevice = new Device( this, b); //open rec |
1114 | // soundDevice->openDsp(); | 1056 | // soundDevice->openDsp(); |
@@ -1283,9 +1225,9 @@ void QtRec::deleteSound() { | |||
1283 | return; | 1225 | return; |
1284 | #ifndef DEV_VERSION | 1226 | // #ifndef DEV_VERSION |
1285 | switch ( QMessageBox::warning(this,tr("Delete"), | 1227 | // switch ( QMessageBox::warning(this,tr("Delete"), |
1286 | tr("Do you really want to <font size=+2><B>DELETE</B></font>\nthe selected file?"), | 1228 | // tr("Do you really want to <font size=+2><B>DELETE</B></font>\nthe selected file?"), |
1287 | tr("Yes"),tr("No"),0,1,1) ) { | 1229 | // tr("Yes"),tr("No"),0,1,1) ) { |
1288 | case 0: | 1230 | // case 0: |
1289 | #endif | 1231 | // #endif |
1290 | { | 1232 | // { |
1291 | QString file = ListView1->currentItem()->text(0); | 1233 | QString file = ListView1->currentItem()->text(0); |
@@ -1322,8 +1264,3 @@ void QtRec::deleteSound() { | |||
1322 | update(); | 1264 | update(); |
1323 | } | 1265 | setCaption( tr( "OpieRecord " )); |
1324 | #ifndef DEV_VERSION | ||
1325 | }; | ||
1326 | #endif | ||
1327 | setCaption( tr( "OpieRecord " ) + QString::number(VERSION) ); | ||
1328 | |||
1329 | } | 1266 | } |
@@ -1445,2 +1382,3 @@ void QtRec::keyReleaseEvent( QKeyEvent *e) { | |||
1445 | void QtRec::endRecording() { | 1382 | void QtRec::endRecording() { |
1383 | |||
1446 | monitoring = false; | 1384 | monitoring = false; |
@@ -1505,2 +1443,4 @@ void QtRec::endRecording() { | |||
1505 | selectItemByName( currentFile); | 1443 | selectItemByName( currentFile); |
1444 | setCaption( tr( "OpieRecord " )); | ||
1445 | |||
1506 | } | 1446 | } |
@@ -1537,3 +1477,3 @@ void QtRec::endPlaying() { | |||
1537 | killTimers(); | 1477 | killTimers(); |
1538 | owarn << "reset slider" << oendl; | 1478 | // owarn << "reset slider" << oendl; |
1539 | timeSlider->setValue(0); | 1479 | timeSlider->setValue(0); |
@@ -1570,3 +1510,3 @@ bool QtRec::openPlayFile() { | |||
1570 | monitoring = false; | 1510 | monitoring = false; |
1571 | setCaption( tr( "OpieRecord " ) + QString::number(VERSION) ); | 1511 | setCaption( tr( "OpieRecord " )); |
1572 | QMessageBox::message(tr("Note"), tr("Could not open audio file.\n") | 1512 | QMessageBox::message(tr("Note"), tr("Could not open audio file.\n") |
@@ -1587,3 +1527,3 @@ bool QtRec::openPlayFile() { | |||
1587 | 1527 | ||
1588 | owarn << "seconds " << sec << "" << oendl; | 1528 | // owarn << "seconds " << sec << "" << oendl; |
1589 | 1529 | ||
@@ -1604,3 +1544,3 @@ void QtRec::listPressed( int mouse, QListViewItem *item, const QPoint &, int ) { | |||
1604 | currentFile = item->text(0); | 1544 | currentFile = item->text(0); |
1605 | setCaption( "OpieRecord " + currentFile); | 1545 | // setCaption( "OpieRecord " + currentFile); |
1606 | } | 1546 | } |
@@ -1854,7 +1794,2 @@ void QtRec::timerEvent( QTimerEvent * ) { | |||
1854 | QString timeString; | 1794 | QString timeString; |
1855 | #ifdef DEV_VERSION | ||
1856 | QString msg; | ||
1857 | msg.sprintf("%d, %d, %d", filePara.sampleRate, filePara.channels, filePara.resolution); | ||
1858 | setCaption( msg +" :: "+QString::number(secCount)); | ||
1859 | #endif | ||
1860 | 1795 | ||