Diffstat (limited to 'noncore/multimedia/opierec/qtrec.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/multimedia/opierec/qtrec.cpp | 129 |
1 files changed, 64 insertions, 65 deletions
diff --git a/noncore/multimedia/opierec/qtrec.cpp b/noncore/multimedia/opierec/qtrec.cpp index 1c64ab1..2187d5a 100644 --- a/noncore/multimedia/opierec/qtrec.cpp +++ b/noncore/multimedia/opierec/qtrec.cpp | |||
@@ -10,5 +10,2 @@ | |||
10 | #include "waveform.h" | 10 | #include "waveform.h" |
11 | |||
12 | #include <pthread.h> | ||
13 | |||
14 | extern "C" { | 11 | extern "C" { |
@@ -17,4 +14,4 @@ extern "C" { | |||
17 | 14 | ||
18 | #include <sys/soundcard.h> | 15 | /* OPIE */ |
19 | 16 | #include <opie2/odebug.h> | |
20 | #include <qpe/config.h> | 17 | #include <qpe/config.h> |
@@ -24,6 +21,7 @@ extern "C" { | |||
24 | #include <qpe/storage.h> | 21 | #include <qpe/storage.h> |
22 | using namespace Opie::Core; | ||
25 | 23 | ||
24 | /* QT */ | ||
26 | #include <qcheckbox.h> | 25 | #include <qcheckbox.h> |
27 | #include <qcombobox.h> | 26 | #include <qcombobox.h> |
28 | //#include <qdatetime.h> | ||
29 | #include <qdir.h> | 27 | #include <qdir.h> |
@@ -40,2 +38,3 @@ extern "C" { | |||
40 | 38 | ||
39 | /* STD */ | ||
41 | #include <errno.h> | 40 | #include <errno.h> |
@@ -55,3 +54,3 @@ extern "C" { | |||
55 | #include <sys/signal.h> | 54 | #include <sys/signal.h> |
56 | 55 | #include <pthread.h> | |
57 | 56 | ||
@@ -138,8 +137,8 @@ void quickRec() | |||
138 | // int bits = filePara.resolution; | 137 | // int bits = filePara.resolution; |
139 | // qDebug("bits %d", bits); | 138 | // odebug << "bits " << bits << "" << oendl; |
140 | 139 | ||
141 | if( filePara.resolution == 16 ) { //AFMT_S16_LE) | 140 | if( filePara.resolution == 16 ) { //AFMT_S16_LE) |
142 | // qDebug("AFMT_S16_LE size %d", filePara.SecondsToRecord); | 141 | // odebug << "AFMT_S16_LE size " << filePara.SecondsToRecord << "" << oendl; |
143 | // qDebug("samples to record %d", filePara.samplesToRecord); | 142 | // odebug << "samples to record " << filePara.samplesToRecord << "" << oendl; |
144 | // qDebug("%d", filePara.sd); | 143 | // odebug << "" << filePara.sd << "" << oendl; |
145 | level = 7; | 144 | level = 7; |
@@ -148,3 +147,3 @@ void quickRec() | |||
148 | if( filePara.format == WAVE_FORMAT_DVI_ADPCM) { | 147 | if( filePara.format == WAVE_FORMAT_DVI_ADPCM) { |
149 | // qDebug("start recording WAVE_FORMAT_DVI_ADPCM"); | 148 | // odebug << "start recording WAVE_FORMAT_DVI_ADPCM" << oendl; |
150 | // <<<<<<<<<<<<<<<<<<<<<<<<<<< WAVE_FORMAT_DVI_ADPCM >>>>>>>>>>>>>>>>>>>>>> | 149 | // <<<<<<<<<<<<<<<<<<<<<<<<<<< WAVE_FORMAT_DVI_ADPCM >>>>>>>>>>>>>>>>>>>>>> |
@@ -159,3 +158,3 @@ void quickRec() | |||
159 | if ( stopped) { | 158 | if ( stopped) { |
160 | // qDebug("quickRec:: stopped"); | 159 | // odebug << "quickRec:: stopped" << oendl; |
161 | break; | 160 | break; |
@@ -168,3 +167,3 @@ void quickRec() | |||
168 | perror("recording error "); | 167 | perror("recording error "); |
169 | qDebug( "%s %d", filePara.fileName, number); | 168 | odebug << "" << filePara.fileName << " " << number << "" << oendl; |
170 | stopped = true; | 169 | stopped = true; |
@@ -194,3 +193,3 @@ void quickRec() | |||
194 | // <<<<<<<<<<<<<<<<<<<<<<<<<<< WAVE_FORMAT_PCM >>>>>>>>>>>>>>>>>>>>>> | 193 | // <<<<<<<<<<<<<<<<<<<<<<<<<<< WAVE_FORMAT_PCM >>>>>>>>>>>>>>>>>>>>>> |
195 | qDebug("start recording WAVE_FORMAT_PCM"); | 194 | odebug << "start recording WAVE_FORMAT_PCM" << oendl; |
196 | short inbuffer[ BUFSIZE ], outbuffer[ BUFSIZE ]; | 195 | short inbuffer[ BUFSIZE ], outbuffer[ BUFSIZE ]; |
@@ -201,3 +200,3 @@ void quickRec() | |||
201 | if ( stopped) { | 200 | if ( stopped) { |
202 | qDebug("quickRec:: stopped"); | 201 | odebug << "quickRec:: stopped" << oendl; |
203 | stopped = true; | 202 | stopped = true; |
@@ -212,3 +211,3 @@ void quickRec() | |||
212 | perror( "recording error "); | 211 | perror( "recording error "); |
213 | qDebug( filePara.fileName); | 212 | odebug << filePara.fileName << oendl; |
214 | stopped = true; | 213 | stopped = true; |
@@ -252,3 +251,3 @@ void quickRec() | |||
252 | if ( stopped) { | 251 | if ( stopped) { |
253 | qDebug("quickRec:: stopped"); | 252 | odebug << "quickRec:: stopped" << oendl; |
254 | break; // stop if playing was set to false | 253 | break; // stop if playing was set to false |
@@ -375,3 +374,3 @@ void playIt() | |||
375 | if( /*total >= filePara.numberSamples || */ bytesWritten == 0) { | 374 | if( /*total >= filePara.numberSamples || */ bytesWritten == 0) { |
376 | qWarning("Jane! Stop this crazy thing!"); | 375 | owarn << "Jane! Stop this crazy thing!" << oendl; |
377 | stopped = true; | 376 | stopped = true; |
@@ -720,3 +719,3 @@ void QtRec::initIconView() { | |||
720 | int nFiles = cfg.readNumEntry("NumberofFiles",0); | 719 | int nFiles = cfg.readNumEntry("NumberofFiles",0); |
721 | // qDebug("init number of files %d", nFiles); | 720 | // odebug << "init number of files " << nFiles << "" << oendl; |
722 | 721 | ||
@@ -862,3 +861,3 @@ void QtRec::initConfig() { | |||
862 | void QtRec::stop() { | 861 | void QtRec::stop() { |
863 | qWarning("STOP"); | 862 | owarn << "STOP" << oendl; |
864 | setRecordButton(false); | 863 | setRecordButton(false); |
@@ -924,6 +923,6 @@ bool QtRec::rec() { //record | |||
924 | //filePara.sampleRate = cfg.readNumEntry("samplerate", 22050); | 923 | //filePara.sampleRate = cfg.readNumEntry("samplerate", 22050); |
925 | // qDebug("sample rate is %d", filePara.sampleRate); | 924 | // odebug << "sample rate is " << filePara.sampleRate << "" << oendl; |
926 | filePara.SecondsToRecord = getCurrentSizeLimit(); | 925 | filePara.SecondsToRecord = getCurrentSizeLimit(); |
927 | 926 | ||
928 | // qDebug("size limit %d sec", filePara.SecondsToRecord); | 927 | // odebug << "size limit " << filePara.SecondsToRecord << " sec" << oendl; |
929 | int diskSize = checkDiskSpace( (const QString &) wavFile->trackName()); | 928 | int diskSize = checkDiskSpace( (const QString &) wavFile->trackName()); |
@@ -933,3 +932,3 @@ bool QtRec::rec() { //record | |||
933 | } else if( filePara.format == WAVE_FORMAT_PCM) { | 932 | } else if( filePara.format == WAVE_FORMAT_PCM) { |
934 | // qDebug("WAVE_FORMAT_PCM"); | 933 | // odebug << "WAVE_FORMAT_PCM" << oendl; |
935 | fileSize = (filePara.SecondsToRecord ) * filePara.channels | 934 | fileSize = (filePara.SecondsToRecord ) * filePara.channels |
@@ -937,3 +936,3 @@ bool QtRec::rec() { //record | |||
937 | } else { | 936 | } else { |
938 | // qDebug("WAVE_FORMAT_DVI_ADPCM"); | 937 | // odebug << "WAVE_FORMAT_DVI_ADPCM" << oendl; |
939 | fileSize = ((filePara.SecondsToRecord) * filePara.channels | 938 | fileSize = ((filePara.SecondsToRecord) * filePara.channels |
@@ -949,3 +948,3 @@ bool QtRec::rec() { //record | |||
949 | // else { | 948 | // else { |
950 | qDebug("Setting timeslider %d", filePara.samplesToRecord); | 949 | odebug << "Setting timeslider " << filePara.samplesToRecord << "" << oendl; |
951 | // if(fileSize != 0) | 950 | // if(fileSize != 0) |
@@ -968,3 +967,3 @@ bool QtRec::rec() { //record | |||
968 | filePara.fileName=currentFile.latin1(); | 967 | filePara.fileName=currentFile.latin1(); |
969 | qDebug("Start recording thread"); | 968 | odebug << "Start recording thread" << oendl; |
970 | stopped = false; | 969 | stopped = false; |
@@ -1012,3 +1011,3 @@ void QtRec::getOutVol( ) { | |||
1012 | filePara.outVol = soundDevice->getOutVolume(); | 1011 | filePara.outVol = soundDevice->getOutVolume(); |
1013 | // qDebug("out vol %d", filePara.outVol); | 1012 | // odebug << "out vol " << filePara.outVol << "" << oendl; |
1014 | OutputSlider->setValue( -filePara.outVol); | 1013 | OutputSlider->setValue( -filePara.outVol); |
@@ -1018,3 +1017,3 @@ void QtRec::getInVol() { | |||
1018 | filePara.inVol = soundDevice->getInVolume(); | 1017 | filePara.inVol = soundDevice->getInVolume(); |
1019 | // qDebug("in vol %d", filePara.inVol); | 1018 | // odebug << "in vol " << filePara.inVol << "" << oendl; |
1020 | InputSlider->setValue( -filePara.inVol); | 1019 | InputSlider->setValue( -filePara.inVol); |
@@ -1092,3 +1091,3 @@ bool QtRec::setupAudio( bool b) { | |||
1092 | filePara.format = WAVE_FORMAT_PCM; | 1091 | filePara.format = WAVE_FORMAT_PCM; |
1093 | // qDebug("WAVE_FORMAT_PCM"); | 1092 | // odebug << "WAVE_FORMAT_PCM" << oendl; |
1094 | } else { | 1093 | } else { |
@@ -1096,3 +1095,3 @@ bool QtRec::setupAudio( bool b) { | |||
1096 | sampleformat = AFMT_S16_LE; | 1095 | sampleformat = AFMT_S16_LE; |
1097 | // qDebug("WAVE_FORMAT_DVI_ADPCM"); | 1096 | // odebug << "WAVE_FORMAT_DVI_ADPCM" << oendl; |
1098 | } | 1097 | } |
@@ -1112,4 +1111,4 @@ bool QtRec::setupAudio( bool b) { | |||
1112 | // if(soundDevice) delete soundDevice; | 1111 | // if(soundDevice) delete soundDevice; |
1113 | qDebug("<<<<<<<<<<<<<<<<<<<open dsp %d %d %d", filePara.sampleRate, filePara.channels, sampleformat); | 1112 | odebug << "<<<<<<<<<<<<<<<<<<<open dsp " << filePara.sampleRate << " " << filePara.channels << " " << sampleformat << "" << oendl; |
1114 | qWarning("change waveform settings"); | 1113 | owarn << "change waveform settings" << oendl; |
1115 | waveform->changeSettings( filePara.sampleRate, filePara.channels ); | 1114 | waveform->changeSettings( filePara.sampleRate, filePara.channels ); |
@@ -1120,3 +1119,3 @@ bool QtRec::setupAudio( bool b) { | |||
1120 | 1119 | ||
1121 | qDebug("device has been made %d", soundDevice->sd); | 1120 | odebug << "device has been made " << soundDevice->sd << "" << oendl; |
1122 | 1121 | ||
@@ -1151,3 +1150,3 @@ bool QtRec::setupAudio( bool b) { | |||
1151 | bool QtRec::setUpFile() { //setup file for recording | 1150 | bool QtRec::setUpFile() { //setup file for recording |
1152 | // qDebug("Setting up wavfile"); | 1151 | // odebug << "Setting up wavfile" << oendl; |
1153 | // if(wavFile) delete wavFile; | 1152 | // if(wavFile) delete wavFile; |
@@ -1184,3 +1183,3 @@ bool QtRec::doPlay() { | |||
1184 | QString num; | 1183 | QString num; |
1185 | qDebug( "Play number of samples %d", filePara.numberSamples); | 1184 | odebug << "Play number of samples " << filePara.numberSamples << "" << oendl; |
1186 | 1185 | ||
@@ -1236,3 +1235,3 @@ void QtRec::changesamplerateCombo(int i) { | |||
1236 | filePara.sampleRate=rate; | 1235 | filePara.sampleRate=rate; |
1237 | qDebug( "Change sample rate %d", rate); | 1236 | odebug << "Change sample rate " << rate << "" << oendl; |
1238 | cfg.write(); | 1237 | cfg.write(); |
@@ -1256,3 +1255,3 @@ void QtRec::changeDirCombo(int index) { | |||
1256 | cfg.writeEntry("directory", recDir); | 1255 | cfg.writeEntry("directory", recDir); |
1257 | qDebug("new rec dir "+recDir); | 1256 | odebug << "new rec dir "+recDir << oendl; |
1258 | } | 1257 | } |
@@ -1376,3 +1375,3 @@ void QtRec::keyPressEvent( QKeyEvent *e) { | |||
1376 | case Key_Left: { | 1375 | case Key_Left: { |
1377 | qDebug("rewinding"); | 1376 | odebug << "rewinding" << oendl; |
1378 | if( !e->isAutoRepeat()) | 1377 | if( !e->isAutoRepeat()) |
@@ -1430,3 +1429,3 @@ void QtRec::keyReleaseEvent( QKeyEvent *e) { | |||
1430 | // stop(); | 1429 | // stop(); |
1431 | qDebug("Up"); | 1430 | odebug << "Up" << oendl; |
1432 | break; | 1431 | break; |
@@ -1434,3 +1433,3 @@ void QtRec::keyReleaseEvent( QKeyEvent *e) { | |||
1434 | // start(); | 1433 | // start(); |
1435 | // qDebug("Down"); | 1434 | // odebug << "Down" << oendl; |
1436 | // newSound(); | 1435 | // newSound(); |
@@ -1438,3 +1437,3 @@ void QtRec::keyReleaseEvent( QKeyEvent *e) { | |||
1438 | case Key_Left: | 1437 | case Key_Left: |
1439 | qDebug("Left"); | 1438 | odebug << "Left" << oendl; |
1440 | rewindReleased(); | 1439 | rewindReleased(); |
@@ -1442,3 +1441,3 @@ void QtRec::keyReleaseEvent( QKeyEvent *e) { | |||
1442 | case Key_Right: | 1441 | case Key_Right: |
1443 | qDebug("Right"); | 1442 | odebug << "Right" << oendl; |
1444 | FastforwardReleased(); | 1443 | FastforwardReleased(); |
@@ -1477,3 +1476,3 @@ void QtRec::endRecording() { | |||
1477 | cmd.sprintf("mv "+ wavFile->trackName() + " " + wavFile->currentFileName); | 1476 | cmd.sprintf("mv "+ wavFile->trackName() + " " + wavFile->currentFileName); |
1478 | // qDebug("moving tmp file to "+currentFileName); | 1477 | // odebug << "moving tmp file to "+currentFileName << oendl; |
1479 | system( cmd.latin1()); | 1478 | system( cmd.latin1()); |
@@ -1481,3 +1480,3 @@ void QtRec::endRecording() { | |||
1481 | 1480 | ||
1482 | qDebug("Just moved " + wavFile->currentFileName); | 1481 | odebug << "Just moved " + wavFile->currentFileName << oendl; |
1483 | Config cfg("OpieRec"); | 1482 | Config cfg("OpieRec"); |
@@ -1497,6 +1496,6 @@ void QtRec::endRecording() { | |||
1497 | cfg.writeEntry( wavFile->currentFileName, time ); | 1496 | cfg.writeEntry( wavFile->currentFileName, time ); |
1498 | // qDebug("writing config numberOfRecordedSeconds "+time); | 1497 | // odebug << "writing config numberOfRecordedSeconds "+time << oendl; |
1499 | 1498 | ||
1500 | cfg.write(); | 1499 | cfg.write(); |
1501 | qDebug("finished recording"); | 1500 | odebug << "finished recording" << oendl; |
1502 | timeLabel->setText(""); | 1501 | timeLabel->setText(""); |
@@ -1518,3 +1517,3 @@ void QtRec::endPlaying() { | |||
1518 | // errorStop(); | 1517 | // errorStop(); |
1519 | // qDebug("end playing"); | 1518 | // odebug << "end playing" << oendl; |
1520 | setRecordButton( false); | 1519 | setRecordButton( false); |
@@ -1530,3 +1529,3 @@ void QtRec::endPlaying() { | |||
1530 | // if(soundDevice) delete soundDevice; | 1529 | // if(soundDevice) delete soundDevice; |
1531 | // qDebug("file and sound device closed"); | 1530 | // odebug << "file and sound device closed" << oendl; |
1532 | timeLabel->setText(""); | 1531 | timeLabel->setText(""); |
@@ -1539,5 +1538,5 @@ void QtRec::endPlaying() { | |||
1539 | 1538 | ||
1540 | // qDebug("track closed"); | 1539 | // odebug << "track closed" << oendl; |
1541 | killTimers(); | 1540 | killTimers(); |
1542 | qWarning("reset slider"); | 1541 | owarn << "reset slider" << oendl; |
1543 | timeSlider->setValue(0); | 1542 | timeSlider->setValue(0); |
@@ -1563,3 +1562,3 @@ bool QtRec::openPlayFile() { | |||
1563 | currentFileName = cfg.readEntry( currentFile, "" ); | 1562 | currentFileName = cfg.readEntry( currentFile, "" ); |
1564 | qDebug("opening for play: " + currentFileName); | 1563 | odebug << "opening for play: " + currentFileName << oendl; |
1565 | } | 1564 | } |
@@ -1588,6 +1587,6 @@ bool QtRec::openPlayFile() { | |||
1588 | 1587 | ||
1589 | qDebug("file %d, samples %d %d", filePara.fd, filePara.numberSamples, filePara.sampleRate); | 1588 | odebug << "file " << filePara.fd << ", samples " << filePara.numberSamples << " " << filePara.sampleRate << "" << oendl; |
1590 | int sec = (int) (( filePara.numberSamples / filePara.sampleRate) / filePara.channels) / ( filePara.channels*( filePara.resolution/8)); | 1589 | int sec = (int) (( filePara.numberSamples / filePara.sampleRate) / filePara.channels) / ( filePara.channels*( filePara.resolution/8)); |
1591 | 1590 | ||
1592 | qWarning("seconds %d", sec); | 1591 | owarn << "seconds " << sec << "" << oendl; |
1593 | 1592 | ||
@@ -1692,3 +1691,3 @@ void QtRec::doRename() { | |||
1692 | void QtRec::okRename() { | 1691 | void QtRec::okRename() { |
1693 | qDebug(renameBox->text()); | 1692 | odebug << renameBox->text() << oendl; |
1694 | QString filename = renameBox->text(); | 1693 | QString filename = renameBox->text(); |
@@ -1704,3 +1703,3 @@ void QtRec::okRename() { | |||
1704 | 1703 | ||
1705 | qDebug("filename is " + filename); | 1704 | odebug << "filename is " + filename << oendl; |
1706 | 1705 | ||
@@ -1775,3 +1774,3 @@ void QtRec::doVolMuting(bool b) { | |||
1775 | void QtRec::doMicMuting(bool b) { | 1774 | void QtRec::doMicMuting(bool b) { |
1776 | // qDebug("mic mute"); | 1775 | // odebug << "mic mute" << oendl; |
1777 | Config cfg( "qpe" ); | 1776 | Config cfg( "qpe" ); |
@@ -1831,3 +1830,3 @@ long QtRec::checkDiskSpace(const QString &path) { | |||
1831 | void QtRec::receive( const QCString &msg, const QByteArray & ) { | 1830 | void QtRec::receive( const QCString &msg, const QByteArray & ) { |
1832 | qDebug("Voicerecord received message "+msg); | 1831 | odebug << "Voicerecord received message "+msg << oendl; |
1833 | 1832 | ||
@@ -1856,3 +1855,3 @@ void QtRec::timerEvent( QTimerEvent * ) { | |||
1856 | 1855 | ||
1857 | qDebug( "%d", secCount ); | 1856 | odebug << "" << secCount << "" << oendl; |
1858 | QString timeString; | 1857 | QString timeString; |
@@ -1872,3 +1871,3 @@ void QtRec::changeTimeSlider(int index) { | |||
1872 | if( ListView1->currentItem() == 0 || !wavFile->track.isOpen()) return; | 1871 | if( ListView1->currentItem() == 0 || !wavFile->track.isOpen()) return; |
1873 | // qDebug("Slider moved to %d",index); | 1872 | // odebug << "Slider moved to " << index << "" << oendl; |
1874 | paused = true; | 1873 | paused = true; |
@@ -1887,3 +1886,3 @@ void QtRec::timeSliderPressed() { | |||
1887 | if( ListView1->currentItem() == 0) return; | 1886 | if( ListView1->currentItem() == 0) return; |
1888 | // qDebug("slider pressed"); | 1887 | // odebug << "slider pressed" << oendl; |
1889 | paused = true; | 1888 | paused = true; |
@@ -1896,3 +1895,3 @@ void QtRec::timeSliderReleased() { | |||
1896 | 1895 | ||
1897 | // qDebug("slider released %d", sliderPos); | 1896 | // odebug << "slider released " << sliderPos << "" << oendl; |
1898 | stopped = false; | 1897 | stopped = false; |
@@ -1926,3 +1925,3 @@ void QtRec::rewindTimerTimeout() { | |||
1926 | timeSlider->setValue( sliderValue ) ; | 1925 | timeSlider->setValue( sliderValue ) ; |
1927 | // qDebug("%d", sliderValue); | 1926 | // odebug << "" << sliderValue << "" << oendl; |
1928 | QString timeString; | 1927 | QString timeString; |
@@ -1940,3 +1939,3 @@ void QtRec::rewindReleased() { | |||
1940 | total = newPos * 4; | 1939 | total = newPos * 4; |
1941 | // qDebug("rewind released %d", total); | 1940 | // odebug << "rewind released " << total << "" << oendl; |
1942 | startTimer( 1000); | 1941 | startTimer( 1000); |
@@ -2004,3 +2003,3 @@ QString QtRec::getStorage(const QString &fileName) { | |||
2004 | // storageComboBox->insertItem( name +" -> "+disk); | 2003 | // storageComboBox->insertItem( name +" -> "+disk); |
2005 | // qDebug(name); | 2004 | // odebug << name << oendl; |
2006 | } | 2005 | } |