author | llornkcor <llornkcor> | 2005-02-19 01:41:12 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2005-02-19 01:41:12 (UTC) |
commit | 42ff7b7515ef2220d3400c468f4cea5828f4faea (patch) (unidiff) | |
tree | 3358e973ff98fcd79311298ffc56c88e39c8b4eb /noncore/multimedia/opierec/qtrec.cpp | |
parent | e24ddf0db8e3e4329caeb8d0bee5db87cec1d2da (diff) | |
download | opie-42ff7b7515ef2220d3400c468f4cea5828f4faea.zip opie-42ff7b7515ef2220d3400c468f4cea5828f4faea.tar.gz opie-42ff7b7515ef2220d3400c468f4cea5828f4faea.tar.bz2 |
simplify some things
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 | |||
@@ -4,5 +4,5 @@ | |||
4 | copyright 2002 by L.J. Potter <ljp@llornkcor.com> | 4 | copyright 2002 by L.J. Potter <ljp@llornkcor.com> |
5 | ****************************************************************************/ | 5 | ****************************************************************************/ |
6 | #define DEV_VERSION | 6 | //#define DEV_VERSION |
7 | 7 | ||
8 | #include "pixmaps.h" | 8 | #include "pixmaps.h" |
@@ -64,33 +64,4 @@ static int deviceBitRates[] = { 8, 16, -1 }; | |||
64 | #endif | 64 | #endif |
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 | ||
96 | //#define ZAURUS 0 | 67 | //#define ZAURUS 0 |
@@ -297,4 +268,5 @@ void quickRec() | |||
297 | } //end main loop | 268 | } //end main loop |
298 | } | 269 | } |
270 | printf("\n"); | ||
299 | } /// END quickRec() | 271 | } /// END quickRec() |
300 | 272 | ||
@@ -451,12 +423,5 @@ QtRec::QtRec( QWidget* parent, const char* name, WFlags fl ) | |||
451 | 423 | ||
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 | ||
462 | getInVol(); | 427 | getInVol(); |
@@ -505,5 +470,5 @@ void QtRec::init() { | |||
505 | 470 | ||
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 ); |
509 | layout->setSpacing( 2); | 474 | layout->setSpacing( 2); |
@@ -577,19 +542,8 @@ void QtRec::init() { | |||
577 | 542 | ||
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 ); |
595 | QPEApplication::setStylusOperation( ListView1->viewport(), QPEApplication::RightOnHold); | 549 | QPEApplication::setStylusOperation( ListView1->viewport(), QPEApplication::RightOnHold); |
@@ -609,5 +563,4 @@ void QtRec::init() { | |||
609 | sampleRateComboBox = new QComboBox( false, sampleGroup, "SampleRateComboBox" ); | 563 | sampleRateComboBox = new QComboBox( false, sampleGroup, "SampleRateComboBox" ); |
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; |
613 | int z = 0; | 566 | int z = 0; |
@@ -718,7 +671,5 @@ void QtRec::init() { | |||
718 | TabWidget->insertTab( tab_5, tr( "Volume" ) ); | 671 | TabWidget->insertTab( tab_5, tr( "Volume" ) ); |
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 ) ); |
724 | 675 | ||
@@ -728,5 +679,4 @@ void QtRec::init() { | |||
728 | 679 | ||
729 | void QtRec::initIconView() { | 680 | void QtRec::initIconView() { |
730 | owarn << "initIconView" << oendl; | ||
731 | ListView1->clear(); | 681 | ListView1->clear(); |
732 | Config cfg("OpieRec"); | 682 | Config cfg("OpieRec"); |
@@ -736,5 +686,5 @@ void QtRec::initIconView() { | |||
736 | 686 | ||
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 | ||
740 | for(int i = 1; i <= nFiles; i++) { | 690 | for(int i = 1; i <= nFiles; i++) { |
@@ -753,5 +703,5 @@ void QtRec::initIconView() { | |||
753 | mediaLocation = getStorage( filePath); | 703 | mediaLocation = getStorage( filePath); |
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*/); |
757 | item->setPixmap( 0, image0); | 707 | item->setPixmap( 0, image0); |
@@ -857,5 +807,5 @@ void QtRec::initConfig() { | |||
857 | 807 | ||
858 | void QtRec::stop() { | 808 | void QtRec::stop() { |
859 | owarn << "STOP" << oendl; | 809 | // owarn << "STOP" << oendl; |
860 | setRecordButton(false); | 810 | setRecordButton(false); |
861 | 811 | ||
@@ -1062,8 +1012,4 @@ bool QtRec::setupAudio( bool b) { | |||
1062 | stereo = filePara.channels; | 1012 | stereo = filePara.channels; |
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; |
1069 | } else { // we want to record | 1015 | } else { // we want to record |
@@ -1099,8 +1045,4 @@ bool QtRec::setupAudio( bool b) { | |||
1099 | flags= O_RDWR; | 1045 | flags= O_RDWR; |
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; |
1106 | } | 1048 | } |
@@ -1108,8 +1050,8 @@ bool QtRec::setupAudio( bool b) { | |||
1108 | // if(soundDevice) delete soundDevice; | 1050 | // if(soundDevice) delete soundDevice; |
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(); |
1115 | soundDevice->reset(); | 1057 | soundDevice->reset(); |
@@ -1282,11 +1224,11 @@ void QtRec::deleteSound() { | |||
1282 | if( ListView1->currentItem() == NULL) | 1224 | if( ListView1->currentItem() == NULL) |
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); |
1292 | QString fileName; | 1234 | QString fileName; |
@@ -1321,10 +1263,5 @@ void QtRec::deleteSound() { | |||
1321 | initIconView(); | 1263 | initIconView(); |
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 | } |
1330 | 1267 | ||
@@ -1444,4 +1381,5 @@ void QtRec::keyReleaseEvent( QKeyEvent *e) { | |||
1444 | 1381 | ||
1445 | void QtRec::endRecording() { | 1382 | void QtRec::endRecording() { |
1383 | |||
1446 | monitoring = false; | 1384 | monitoring = false; |
1447 | recording = false; | 1385 | recording = false; |
@@ -1504,4 +1442,6 @@ void QtRec::endRecording() { | |||
1504 | initIconView(); | 1442 | initIconView(); |
1505 | selectItemByName( currentFile); | 1443 | selectItemByName( currentFile); |
1444 | setCaption( tr( "OpieRecord " )); | ||
1445 | |||
1506 | } | 1446 | } |
1507 | 1447 | ||
@@ -1536,5 +1476,5 @@ void QtRec::endPlaying() { | |||
1536 | odebug << "track closed" << oendl; | 1476 | odebug << "track closed" << oendl; |
1537 | killTimers(); | 1477 | killTimers(); |
1538 | owarn << "reset slider" << oendl; | 1478 | // owarn << "reset slider" << oendl; |
1539 | timeSlider->setValue(0); | 1479 | timeSlider->setValue(0); |
1540 | 1480 | ||
@@ -1569,5 +1509,5 @@ bool QtRec::openPlayFile() { | |||
1569 | QString errorMsg = (QString)strerror(errno); | 1509 | QString errorMsg = (QString)strerror(errno); |
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") |
1573 | + errorMsg + "\n" + currentFile); | 1513 | + errorMsg + "\n" + currentFile); |
@@ -1586,5 +1526,5 @@ bool QtRec::openPlayFile() { | |||
1586 | int sec = (int) (( filePara.numberSamples / filePara.sampleRate) / filePara.channels) / ( filePara.channels*( filePara.resolution/8)); | 1526 | int sec = (int) (( filePara.numberSamples / filePara.sampleRate) / filePara.channels) / ( filePara.channels*( filePara.resolution/8)); |
1587 | 1527 | ||
1588 | owarn << "seconds " << sec << "" << oendl; | 1528 | // owarn << "seconds " << sec << "" << oendl; |
1589 | 1529 | ||
1590 | timeSlider->setRange(0, filePara.numberSamples ); | 1530 | timeSlider->setRange(0, filePara.numberSamples ); |
@@ -1603,5 +1543,5 @@ void QtRec::listPressed( int mouse, QListViewItem *item, const QPoint &, int ) { | |||
1603 | 1543 | ||
1604 | currentFile = item->text(0); | 1544 | currentFile = item->text(0); |
1605 | setCaption( "OpieRecord " + currentFile); | 1545 | // setCaption( "OpieRecord " + currentFile); |
1606 | } | 1546 | } |
1607 | break; | 1547 | break; |
@@ -1853,9 +1793,4 @@ void QtRec::timerEvent( QTimerEvent * ) { | |||
1853 | odebug << "" << secCount << "" << oendl; | 1793 | odebug << "" << secCount << "" << oendl; |
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 | ||
1861 | timeString.sprintf("%d", secCount); | 1796 | timeString.sprintf("%d", secCount); |