author | llornkcor <llornkcor> | 2005-03-12 01:54:52 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2005-03-12 01:54:52 (UTC) |
commit | 84af289057291a49a52a60b390bc5320c02b5a55 (patch) (unidiff) | |
tree | 523f2d36240efd4f500bfbc35996771bebd7360d | |
parent | 6b67c3b2685b2d3f1bc7a787216aa769d4ea257a (diff) | |
download | opie-84af289057291a49a52a60b390bc5320c02b5a55.zip opie-84af289057291a49a52a60b390bc5320c02b5a55.tar.gz opie-84af289057291a49a52a60b390bc5320c02b5a55.tar.bz2 |
fix irregularity with adpcm and bits
-rw-r--r-- | noncore/multimedia/opierec/device.cpp | 16 | ||||
-rw-r--r-- | noncore/multimedia/opierec/opierec.pro | 1 | ||||
-rw-r--r-- | noncore/multimedia/opierec/qtrec.cpp | 21 | ||||
-rw-r--r-- | noncore/multimedia/opierec/wavFile.cpp | 40 |
4 files changed, 43 insertions, 35 deletions
diff --git a/noncore/multimedia/opierec/device.cpp b/noncore/multimedia/opierec/device.cpp index e7e0f4b..a76665e 100644 --- a/noncore/multimedia/opierec/device.cpp +++ b/noncore/multimedia/opierec/device.cpp | |||
@@ -49,56 +49,59 @@ | |||
49 | 49 | ||
50 | #endif | 50 | #endif |
51 | 51 | ||
52 | Device::Device( QObject * parent, bool record ) | 52 | Device::Device( QObject * parent, bool record ) |
53 | : QObject( parent) | 53 | : QObject( parent) |
54 | { | 54 | { |
55 | // dspstr = dsp; | 55 | // dspstr = dsp; |
56 | devForm = -1; | 56 | devForm = -1; |
57 | devCh = -1; | 57 | devCh = -1; |
58 | devRate = -1; | 58 | devRate = -1; |
59 | 59 | ||
60 | if( !record){ //playing | 60 | if( !record){ //playing |
61 | owarn << "setting up DSP for playing" << oendl; | 61 | owarn << "New Sound device DSP for playing" << oendl; |
62 | flags = O_WRONLY; | 62 | flags = O_RDWR; |
63 | // flags = O_WRONLY; | ||
63 | } else { //recording | 64 | } else { //recording |
64 | owarn << "setting up DSP for recording" << oendl; | 65 | owarn << "New Sound device DSP for recording" << oendl; |
65 | flags = O_RDWR; | 66 | flags = O_RDWR; |
66 | // flags = O_RDONLY; | 67 | // flags = O_RDONLY; |
67 | selectMicInput(); | 68 | selectMicInput(); |
68 | } | 69 | } |
69 | } | 70 | } |
70 | 71 | ||
71 | bool Device::openDsp() { | 72 | bool Device::openDsp() { |
73 | qWarning("Device::openDsp()"); | ||
72 | if( openDevice( flags) == -1) { | 74 | if( openDevice( flags) == -1) { |
73 | perror("<<<<<<<<<<<<<<ioctl(\"Open device\")"); | 75 | perror("<<<<<<<<<<<<<<ioctl(\"Open device\")"); |
74 | return false; | 76 | return false; |
75 | } | 77 | } |
76 | return true; | 78 | return true; |
77 | } | 79 | } |
78 | 80 | ||
79 | int Device::openDevice( int flags) { | 81 | int Device::openDevice( int flags) { |
80 | owarn << "Opening"<< dspstr; | 82 | owarn << "Opening sound device:"<< DSPSTROUT << oendl; |
81 | 83 | ||
82 | if (( sd = ::open( DSPSTROUT, flags)) == -1) { | 84 | if (( sd = ::open( DSPSTROUT, O_RDWR)) == -1) { |
83 | perror("open(\"/dev/dsp\")"); | 85 | perror("open(\"/dev/dsp\")\n"); |
84 | QString errorMsg="Could not open audio device\n /dev/dsp\n" | 86 | QString errorMsg="Could not open audio device\n /dev/dsp\n" |
85 | +(QString)strerror(errno); | 87 | +(QString)strerror(errno); |
86 | qDebug( "XXXXXXXXXXXXXXXXXXXXXXX "+errorMsg ); | 88 | qDebug( "XXXXXXXXXXXXXXXXXXXXXXX "+errorMsg ); |
87 | return -1; | 89 | return -1; |
88 | } | 90 | } |
89 | 91 | ||
90 | if(ioctl(sd,SNDCTL_DSP_RESET,0)<0){ | 92 | if(ioctl(sd,SNDCTL_DSP_RESET,0)<0){ |
91 | perror("ioctl RESET"); | 93 | perror("ioctl RESET"); |
92 | } | 94 | } |
95 | qWarning("opened!"); | ||
93 | return sd; | 96 | return sd; |
94 | } | 97 | } |
95 | 98 | ||
96 | int Device::getInVolume() { | 99 | int Device::getInVolume() { |
97 | unsigned int volume = 0; | 100 | unsigned int volume = 0; |
98 | Config cfg("qpe"); | 101 | Config cfg("qpe"); |
99 | cfg.setGroup("Volume"); | 102 | cfg.setGroup("Volume"); |
100 | 103 | ||
101 | return cfg.readNumEntry("Mic"); | 104 | return cfg.readNumEntry("Mic"); |
102 | } | 105 | } |
103 | 106 | ||
104 | int Device::getOutVolume( ) { | 107 | int Device::getOutVolume( ) { |
@@ -141,24 +144,25 @@ bool Device::selectMicInput() { | |||
141 | } else { | 144 | } else { |
142 | if( ioctl( md, SOUND_MIXER_WRITE_RECSRC, &info) == -1) | 145 | if( ioctl( md, SOUND_MIXER_WRITE_RECSRC, &info) == -1) |
143 | perror("ioctl(\"SOUND_MIXER_WRITE_RECSRC\")"); | 146 | perror("ioctl(\"SOUND_MIXER_WRITE_RECSRC\")"); |
144 | ::close(md); | 147 | ::close(md); |
145 | return false; | 148 | return false; |
146 | } | 149 | } |
147 | ::close(md); | 150 | ::close(md); |
148 | 151 | ||
149 | return true; | 152 | return true; |
150 | } | 153 | } |
151 | 154 | ||
152 | bool Device::closeDevice( bool) { | 155 | bool Device::closeDevice( bool) { |
156 | if(sd) | ||
153 | ::close( sd); //close sound device | 157 | ::close( sd); //close sound device |
154 | return true; | 158 | return true; |
155 | } | 159 | } |
156 | 160 | ||
157 | bool Device::setDeviceFormat( int form) { | 161 | bool Device::setDeviceFormat( int form) { |
158 | qDebug( "set device res %d: %d ",form, sd ); | 162 | qDebug( "set device res %d: %d ",form, sd ); |
159 | if (ioctl( sd, SNDCTL_DSP_SETFMT, &form)==-1) { //set format | 163 | if (ioctl( sd, SNDCTL_DSP_SETFMT, &form)==-1) { //set format |
160 | perror("ioctl(\"SNDCTL_DSP_SETFMT\")"); | 164 | perror("ioctl(\"SNDCTL_DSP_SETFMT\")"); |
161 | return false; | 165 | return false; |
162 | } | 166 | } |
163 | devRes=form; | 167 | devRes=form; |
164 | return true; | 168 | return true; |
diff --git a/noncore/multimedia/opierec/opierec.pro b/noncore/multimedia/opierec/opierec.pro index 6a5838a..6008bf7 100644 --- a/noncore/multimedia/opierec/opierec.pro +++ b/noncore/multimedia/opierec/opierec.pro | |||
@@ -22,17 +22,18 @@ contains(CONFIG, pdaudio) { | |||
22 | DEPENDPATH += $(QPEDIR)/include | 22 | DEPENDPATH += $(QPEDIR)/include |
23 | DEFINES += PDAUDIO | 23 | DEFINES += PDAUDIO |
24 | DEFINES += THREADED | 24 | DEFINES += THREADED |
25 | TARGET = qperec | 25 | TARGET = qperec |
26 | 26 | ||
27 | # DESTDIR=$(QPEDIR)/bin | 27 | # DESTDIR=$(QPEDIR)/bin |
28 | } | 28 | } |
29 | 29 | ||
30 | !contains(CONFIG, pdaudio) { | 30 | !contains(CONFIG, pdaudio) { |
31 | INCLUDEPATH += $(OPIEDIR)/include | 31 | INCLUDEPATH += $(OPIEDIR)/include |
32 | DEPENDPATH += $(OPIEDIR)/include | 32 | DEPENDPATH += $(OPIEDIR)/include |
33 | LIBS += -lqpe -lopiecore2 -lpthread | 33 | LIBS += -lqpe -lopiecore2 -lpthread |
34 | DEFINES += THREADED | ||
34 | TARGET = opierec | 35 | TARGET = opierec |
35 | include( $(OPIEDIR)/include.pro ) | 36 | include( $(OPIEDIR)/include.pro ) |
36 | } | 37 | } |
37 | 38 | ||
38 | 39 | ||
diff --git a/noncore/multimedia/opierec/qtrec.cpp b/noncore/multimedia/opierec/qtrec.cpp index e827083..9b761aa 100644 --- a/noncore/multimedia/opierec/qtrec.cpp +++ b/noncore/multimedia/opierec/qtrec.cpp | |||
@@ -147,36 +147,36 @@ void quickRec() | |||
147 | number = soundDevice->devRead( filePara.sd, sbuf, BUFSIZE); | 147 | number = soundDevice->devRead( filePara.sd, sbuf, BUFSIZE); |
148 | 148 | ||
149 | if(number <= 0) { | 149 | if(number <= 0) { |
150 | perror("recording error "); | 150 | perror("recording error "); |
151 | odebug << "" << filePara.fileName << " " << number << "" << oendl; | 151 | odebug << "" << filePara.fileName << " " << number << "" << oendl; |
152 | stopped = true; | 152 | stopped = true; |
153 | return; | 153 | return; |
154 | } | 154 | } |
155 | //if(stereo == 2) { | 155 | //if(stereo == 2) { |
156 | // adpcm_coder( sbuf2, abuf, number/2, &encoder_state); | 156 | // adpcm_coder( sbuf2, abuf, number/2, &encoder_state); |
157 | adpcm_coder( sbuf, abuf, number/2, &encoder_state); | 157 | adpcm_coder( sbuf, abuf, number/2, &encoder_state); |
158 | 158 | ||
159 | bytesWritten = ::write( filePara.fd , (short *)abuf, number/4); | 159 | bytesWritten = ::write( filePara.fd , abuf, number/4); |
160 | 160 | ||
161 | waveform->newSamples( sbuf, number ); | 161 | waveform->newSamples( sbuf, number ); |
162 | 162 | ||
163 | total += bytesWritten; | 163 | total += bytesWritten; |
164 | filePara.numberSamples = total; | 164 | filePara.numberSamples = total; |
165 | timeSlider->setValue( total); | 165 | timeSlider->setValue( total); |
166 | 166 | ||
167 | printf("%d, bytes %d,total %d\r", number, bytesWritten, total); | 167 | printf("%d, bytes %d,total %d\r", number, bytesWritten, total); |
168 | fflush(stdout); | 168 | fflush(stdout); |
169 | 169 | ||
170 | filePara.numberOfRecordedSeconds = (float)total / (float)filePara.sampleRate * (float)2/ filePara.channels; | 170 | filePara.numberOfRecordedSeconds = (float)total / (float)filePara.sampleRate * (float)2;/// filePara.channels; |
171 | 171 | ||
172 | qApp->processEvents(); | 172 | qApp->processEvents(); |
173 | if( total >= filePara.samplesToRecord) { | 173 | if( total >= filePara.samplesToRecord) { |
174 | stopped = true; | 174 | stopped = true; |
175 | break; | 175 | break; |
176 | } | 176 | } |
177 | } | 177 | } |
178 | } else { | 178 | } else { |
179 | // <<<<<<<<<<<<<<<<<<<<<<<<<<< WAVE_FORMAT_PCM >>>>>>>>>>>>>>>>>>>>>> | 179 | // <<<<<<<<<<<<<<<<<<<<<<<<<<< WAVE_FORMAT_PCM >>>>>>>>>>>>>>>>>>>>>> |
180 | odebug << "start recording WAVE_FORMAT_PCM" << oendl; | 180 | odebug << "start recording WAVE_FORMAT_PCM" << oendl; |
181 | short inbuffer[ BUFSIZE ], outbuffer[ BUFSIZE ]; | 181 | short inbuffer[ BUFSIZE ], outbuffer[ BUFSIZE ]; |
182 | memset( inbuffer, 0, BUFSIZE); | 182 | memset( inbuffer, 0, BUFSIZE); |
@@ -292,26 +292,28 @@ void playIt() | |||
292 | for(;;) { // play loop | 292 | for(;;) { // play loop |
293 | if ( stopped) { | 293 | if ( stopped) { |
294 | break; | 294 | break; |
295 | return; | 295 | return; |
296 | }// stop if playing was set to false | 296 | }// stop if playing was set to false |
297 | 297 | ||
298 | number = ::read( filePara.fd, abuf, BUFSIZE / 2); | 298 | number = ::read( filePara.fd, abuf, BUFSIZE / 2); |
299 | adpcm_decoder( abuf, sbuf, number * 2, &decoder_state); | 299 | adpcm_decoder( abuf, sbuf, number * 2, &decoder_state); |
300 | 300 | ||
301 | // for (int i=0;i< number * 2; 2 * i++) { //2*i is left channel | 301 | // for (int i=0;i< number * 2; 2 * i++) { //2*i is left channel |
302 | // sbuf2[i+1]=sbuf2[i]=sbuf[i]; | 302 | // sbuf2[i+1]=sbuf2[i]=sbuf[i]; |
303 | // } | 303 | // } |
304 | bytesWritten = write ( filePara.sd, sbuf, number * 4); | 304 | bytesWritten = write ( soundDevice->sd , sbuf, number * 4); |
305 | waveform->newSamples( (const short *)sbuf, number *4); | 305 | |
306 | waveform->newSamples( sbuf, number ); | ||
307 | |||
306 | // if(filePara.channels==1) | 308 | // if(filePara.channels==1) |
307 | // total += bytesWritten/2; //mono | 309 | // total += bytesWritten/2; //mono |
308 | // else | 310 | // else |
309 | total += bytesWritten; | 311 | total += bytesWritten; |
310 | filePara.numberSamples = total/4; | 312 | filePara.numberSamples = total/4; |
311 | filePara.numberOfRecordedSeconds = (float)total / (float)filePara.sampleRate / 2; | 313 | filePara.numberOfRecordedSeconds = (float)total / (float)filePara.sampleRate / 2; |
312 | 314 | ||
313 | timeSlider->setValue( total/4); | 315 | timeSlider->setValue( total/4); |
314 | // timeString.sprintf("%.2f", filePara.numberOfRecordedSeconds); | 316 | // timeString.sprintf("%.2f", filePara.numberOfRecordedSeconds); |
315 | // if(filePara.numberOfRecordedSeconds>1) | 317 | // if(filePara.numberOfRecordedSeconds>1) |
316 | // timeLabel->setText( timeString+ tr(" seconds")); | 318 | // timeLabel->setText( timeString+ tr(" seconds")); |
317 | // printf("playing number %d, bytes %d, total %d\n",number, bytesWritten, total/4); | 319 | // printf("playing number %d, bytes %d, total %d\n",number, bytesWritten, total/4); |
@@ -333,25 +335,25 @@ void playIt() | |||
333 | 335 | ||
334 | for(;;) { // play loop | 336 | for(;;) { // play loop |
335 | if ( stopped) { | 337 | if ( stopped) { |
336 | break; | 338 | break; |
337 | return; | 339 | return; |
338 | } | 340 | } |
339 | // stop if playing was set to false | 341 | // stop if playing was set to false |
340 | number = ::read( filePara.fd, inbuffer, BUFSIZE); | 342 | number = ::read( filePara.fd, inbuffer, BUFSIZE); |
341 | // for (int i=0;i< number * 2; 2 * i++) { //2*i is left channel | 343 | // for (int i=0;i< number * 2; 2 * i++) { //2*i is left channel |
342 | // // for (int i=0;i< number ; i++) { //2*i is left channel | 344 | // // for (int i=0;i< number ; i++) { //2*i is left channel |
343 | // outbuffer[i+1]= outbuffer[i]=inbuffer[i]; | 345 | // outbuffer[i+1]= outbuffer[i]=inbuffer[i]; |
344 | // } | 346 | // } |
345 | bytesWritten = ::write( filePara.sd, inbuffer, number); | 347 | bytesWritten = ::write( soundDevice->sd, inbuffer, number); |
346 | waveform->newSamples( inbuffer, number); | 348 | waveform->newSamples( inbuffer, number); |
347 | //-------------->>>> out to device | 349 | //-------------->>>> out to device |
348 | // total+=bytesWritten; | 350 | // total+=bytesWritten; |
349 | // if(filePara.channels==1) | 351 | // if(filePara.channels==1) |
350 | // total += bytesWritten/2; //mono | 352 | // total += bytesWritten/2; //mono |
351 | // else | 353 | // else |
352 | total += bytesWritten; | 354 | total += bytesWritten; |
353 | timeSlider->setValue( total); | 355 | timeSlider->setValue( total); |
354 | 356 | ||
355 | filePara.numberSamples = total; | 357 | filePara.numberSamples = total; |
356 | filePara.numberOfRecordedSeconds = (float)total / (float)filePara.sampleRate / (float)2; | 358 | filePara.numberOfRecordedSeconds = (float)total / (float)filePara.sampleRate / (float)2; |
357 | 359 | ||
@@ -779,26 +781,26 @@ void QtRec::initConfig() { | |||
779 | QString temp; | 781 | QString temp; |
780 | sizeLimitCombo->setCurrentItem((i/5)); | 782 | sizeLimitCombo->setCurrentItem((i/5)); |
781 | 783 | ||
782 | stereoCheckBox->setChecked( cfg.readBoolEntry("stereo", 1)); | 784 | stereoCheckBox->setChecked( cfg.readBoolEntry("stereo", 1)); |
783 | if( stereoCheckBox->isChecked()) { | 785 | if( stereoCheckBox->isChecked()) { |
784 | filePara.channels = 2; | 786 | filePara.channels = 2; |
785 | } else { | 787 | } else { |
786 | filePara.channels = 1; | 788 | filePara.channels = 1; |
787 | } | 789 | } |
788 | 790 | ||
789 | compressionCheckBox->setChecked( cfg.readBoolEntry("wavCompression",1)); | 791 | compressionCheckBox->setChecked( cfg.readBoolEntry("wavCompression",1)); |
790 | if( compressionCheckBox->isChecked()) { | 792 | if( compressionCheckBox->isChecked()) { |
793 | bitRateComboBox->setCurrentItem(1); | ||
791 | bitRateComboBox->setEnabled(false); | 794 | bitRateComboBox->setEnabled(false); |
792 | bitRateComboBox->setCurrentItem(0); | ||
793 | filePara.resolution=16; | 795 | filePara.resolution=16; |
794 | } | 796 | } |
795 | 797 | ||
796 | autoMuteCheckBox->setChecked( cfg.readBoolEntry("useAutoMute",0)); | 798 | autoMuteCheckBox->setChecked( cfg.readBoolEntry("useAutoMute",0)); |
797 | if( autoMuteCheckBox->isChecked()) | 799 | if( autoMuteCheckBox->isChecked()) |
798 | slotAutoMute(true); | 800 | slotAutoMute(true); |
799 | else | 801 | else |
800 | slotAutoMute(false); | 802 | slotAutoMute(false); |
801 | 803 | ||
802 | Config cofg( "qpe"); | 804 | Config cofg( "qpe"); |
803 | cofg.setGroup( "Volume"); | 805 | cofg.setGroup( "Volume"); |
804 | outMuteCheckBox->setChecked( cofg.readBoolEntry( "Mute",0)); | 806 | outMuteCheckBox->setChecked( cofg.readBoolEntry( "Mute",0)); |
@@ -1039,25 +1041,25 @@ bool QtRec::setupAudio( bool b) { | |||
1039 | // odebug << "WAVE_FORMAT_DVI_ADPCM" << oendl; | 1041 | // odebug << "WAVE_FORMAT_DVI_ADPCM" << oendl; |
1040 | } | 1042 | } |
1041 | #endif | 1043 | #endif |
1042 | 1044 | ||
1043 | stereo = filePara.channels; | 1045 | stereo = filePara.channels; |
1044 | // filePara.sampleRate = sampleRateComboBox->currentText().toInt( &ok,10);//44100; | 1046 | // filePara.sampleRate = sampleRateComboBox->currentText().toInt( &ok,10);//44100; |
1045 | flags= O_RDWR; | 1047 | flags= O_RDWR; |
1046 | // flags= O_RDONLY; | 1048 | // flags= O_RDONLY; |
1047 | recording = true; | 1049 | recording = true; |
1048 | } | 1050 | } |
1049 | 1051 | ||
1050 | // if(soundDevice) delete soundDevice; | 1052 | // if(soundDevice) delete soundDevice; |
1051 | odebug << "<<<<<<<<<<<<<<<<<<<open dsp " << filePara.sampleRate << " " << filePara.channels << " " << sampleformat << "" << oendl; | 1053 | owarn << "<<<<<<<<<<<<<<<<<<<open dsp " << filePara.sampleRate << " " << filePara.channels << " " << sampleformat << "" << oendl; |
1052 | // owarn << "change waveform settings" << oendl; | 1054 | // owarn << "change waveform settings" << oendl; |
1053 | waveform->changeSettings( filePara.sampleRate, filePara.channels ); | 1055 | waveform->changeSettings( filePara.sampleRate, filePara.channels ); |
1054 | 1056 | ||
1055 | soundDevice = new Device( this, b); //open rec | 1057 | soundDevice = new Device( this, b); //open rec |
1056 | // soundDevice->openDsp(); | 1058 | // soundDevice->openDsp(); |
1057 | soundDevice->reset(); | 1059 | soundDevice->reset(); |
1058 | 1060 | ||
1059 | odebug << "device has been made " << soundDevice->sd << "" << oendl; | 1061 | odebug << "device has been made " << soundDevice->sd << "" << oendl; |
1060 | 1062 | ||
1061 | ////////////////// <<<<<<<<<<<<>>>>>>>>>>>> | 1063 | ////////////////// <<<<<<<<<<<<>>>>>>>>>>>> |
1062 | soundDevice->setDeviceFormat( sampleformat); | 1064 | soundDevice->setDeviceFormat( sampleformat); |
1063 | soundDevice->setDeviceChannels( filePara.channels); | 1065 | soundDevice->setDeviceChannels( filePara.channels); |
@@ -1474,25 +1476,25 @@ void QtRec::endPlaying() { | |||
1474 | // if(wavFile) delete wavFile; //this crashes | 1476 | // if(wavFile) delete wavFile; //this crashes |
1475 | 1477 | ||
1476 | odebug << "track closed" << oendl; | 1478 | odebug << "track closed" << oendl; |
1477 | killTimers(); | 1479 | killTimers(); |
1478 | // owarn << "reset slider" << oendl; | 1480 | // owarn << "reset slider" << oendl; |
1479 | timeSlider->setValue(0); | 1481 | timeSlider->setValue(0); |
1480 | 1482 | ||
1481 | // if(soundDevice) delete soundDevice; | 1483 | // if(soundDevice) delete soundDevice; |
1482 | 1484 | ||
1483 | } | 1485 | } |
1484 | 1486 | ||
1485 | bool QtRec::openPlayFile() { | 1487 | bool QtRec::openPlayFile() { |
1486 | 1488 | qWarning("opening file"); | |
1487 | qApp->processEvents(); | 1489 | qApp->processEvents(); |
1488 | if( currentFile.isEmpty()) { | 1490 | if( currentFile.isEmpty()) { |
1489 | QMessageBox::message(tr("Opierec"),tr("Please select file to play")); | 1491 | QMessageBox::message(tr("Opierec"),tr("Please select file to play")); |
1490 | endPlaying(); | 1492 | endPlaying(); |
1491 | return false; | 1493 | return false; |
1492 | } | 1494 | } |
1493 | QString currentFileName; | 1495 | QString currentFileName; |
1494 | Config cfg("OpieRec"); | 1496 | Config cfg("OpieRec"); |
1495 | cfg.setGroup("Sounds"); | 1497 | cfg.setGroup("Sounds"); |
1496 | int nFiles = cfg.readNumEntry( "NumberofFiles", 0); | 1498 | int nFiles = cfg.readNumEntry( "NumberofFiles", 0); |
1497 | for(int i=0;i<nFiles+1;i++) { //look for file | 1499 | for(int i=0;i<nFiles+1;i++) { //look for file |
1498 | if( cfg.readEntry( QString::number(i),"").find( currentFile,0,true) != -1) { | 1500 | if( cfg.readEntry( QString::number(i),"").find( currentFile,0,true) != -1) { |
@@ -1717,26 +1719,27 @@ void QtRec::doMicMuting(bool b) { | |||
1717 | QCopEnvelope( "QPE/System", "micChange(bool)" ) << b; | 1719 | QCopEnvelope( "QPE/System", "micChange(bool)" ) << b; |
1718 | } | 1720 | } |
1719 | 1721 | ||
1720 | void QtRec::compressionSelected(bool b) { | 1722 | void QtRec::compressionSelected(bool b) { |
1721 | Config cfg("OpieRec"); | 1723 | Config cfg("OpieRec"); |
1722 | cfg.setGroup("Settings"); | 1724 | cfg.setGroup("Settings"); |
1723 | cfg.writeEntry("wavCompression", b); | 1725 | cfg.writeEntry("wavCompression", b); |
1724 | cfg.writeEntry("bitrate", 16); | 1726 | cfg.writeEntry("bitrate", 16); |
1725 | filePara.resolution = 16; | 1727 | filePara.resolution = 16; |
1726 | cfg.write(); | 1728 | cfg.write(); |
1727 | 1729 | ||
1728 | if(b) { | 1730 | if(b) { |
1729 | bitRateComboBox->setEnabled( false); | 1731 | qWarning("set adpcm"); |
1730 | bitRateComboBox->setCurrentItem( 1); | 1732 | bitRateComboBox->setCurrentItem( 1); |
1733 | bitRateComboBox->setEnabled( false); | ||
1731 | filePara.resolution = 16; | 1734 | filePara.resolution = 16; |
1732 | } else{ | 1735 | } else{ |
1733 | bitRateComboBox->setEnabled( true); | 1736 | bitRateComboBox->setEnabled( true); |
1734 | } | 1737 | } |
1735 | } | 1738 | } |
1736 | 1739 | ||
1737 | long QtRec::checkDiskSpace(const QString &path) { | 1740 | long QtRec::checkDiskSpace(const QString &path) { |
1738 | 1741 | ||
1739 | struct statfs fs; | 1742 | struct statfs fs; |
1740 | 1743 | ||
1741 | if ( !statfs( path.latin1(), &fs ) ) { | 1744 | if ( !statfs( path.latin1(), &fs ) ) { |
1742 | 1745 | ||
diff --git a/noncore/multimedia/opierec/wavFile.cpp b/noncore/multimedia/opierec/wavFile.cpp index 80453e1..b53c416 100644 --- a/noncore/multimedia/opierec/wavFile.cpp +++ b/noncore/multimedia/opierec/wavFile.cpp | |||
@@ -18,25 +18,25 @@ using namespace Opie::Core; | |||
18 | #include <sys/vfs.h> | 18 | #include <sys/vfs.h> |
19 | #include <fcntl.h> | 19 | #include <fcntl.h> |
20 | #include <math.h> | 20 | #include <math.h> |
21 | #include <mntent.h> | 21 | #include <mntent.h> |
22 | #include <stdio.h> | 22 | #include <stdio.h> |
23 | #include <stdlib.h> | 23 | #include <stdlib.h> |
24 | #include <unistd.h> | 24 | #include <unistd.h> |
25 | 25 | ||
26 | WavFile::WavFile( QObject * parent,const QString &fileName, bool makeNwFile, int sampleRate, | 26 | WavFile::WavFile( QObject * parent,const QString &fileName, bool makeNwFile, int sampleRate, |
27 | int channels, int resolution, int format ) | 27 | int channels, int resolution, int format ) |
28 | : QObject( parent) | 28 | : QObject( parent) |
29 | { | 29 | { |
30 | //odebug << "new wave file" << oendl; | 30 | owarn << "new wave file: " << fileName << oendl; |
31 | bool b = makeNwFile; | 31 | bool b = makeNwFile; |
32 | wavSampleRate=sampleRate; | 32 | wavSampleRate=sampleRate; |
33 | wavFormat=format; | 33 | wavFormat=format; |
34 | wavChannels=channels; | 34 | wavChannels=channels; |
35 | wavResolution=resolution; | 35 | wavResolution=resolution; |
36 | useTmpFile=false; | 36 | useTmpFile=false; |
37 | if( b) { | 37 | if( b) { |
38 | newFile(); | 38 | newFile(); |
39 | } else { | 39 | } else { |
40 | openFile(fileName); | 40 | openFile(fileName); |
41 | } | 41 | } |
42 | } | 42 | } |
@@ -100,25 +100,25 @@ return true; | |||
100 | 100 | ||
101 | WavFile::~WavFile() { | 101 | WavFile::~WavFile() { |
102 | 102 | ||
103 | closeFile(); | 103 | closeFile(); |
104 | } | 104 | } |
105 | 105 | ||
106 | void WavFile::closeFile() { | 106 | void WavFile::closeFile() { |
107 | if(track.isOpen()) | 107 | if(track.isOpen()) |
108 | track.close(); | 108 | track.close(); |
109 | } | 109 | } |
110 | 110 | ||
111 | int WavFile::openFile(const QString ¤tFileName) { | 111 | int WavFile::openFile(const QString ¤tFileName) { |
112 | // odebug << "open play file "+currentFileName << oendl; | 112 | qWarning("open play file "+currentFileName);; |
113 | closeFile(); | 113 | closeFile(); |
114 | 114 | ||
115 | track.setName(currentFileName); | 115 | track.setName(currentFileName); |
116 | 116 | ||
117 | if(!track.open(IO_ReadOnly)) { | 117 | if(!track.open(IO_ReadOnly)) { |
118 | QString errorMsg=(QString)strerror(errno); | 118 | QString errorMsg=(QString)strerror(errno); |
119 | odebug << "<<<<<<<<<<< "+errorMsg+currentFileName << oendl; | 119 | odebug << "<<<<<<<<<<< "+errorMsg+currentFileName << oendl; |
120 | QMessageBox::message("Note", "Error opening file.\n" +errorMsg); | 120 | QMessageBox::message("Note", "Error opening file.\n" +errorMsg); |
121 | return -1; | 121 | return -1; |
122 | } else { | 122 | } else { |
123 | parseWavHeader( track.handle()); | 123 | parseWavHeader( track.handle()); |
124 | } | 124 | } |
@@ -143,112 +143,112 @@ bool WavFile::setWavHeader(int fd, wavhdr *hdr) { | |||
143 | 143 | ||
144 | // (*hdr).nChannels = 1;//filePara.channels;// ? 2 : 1*/; // channels | 144 | // (*hdr).nChannels = 1;//filePara.channels;// ? 2 : 1*/; // channels |
145 | (*hdr).nChannels = wavChannels;// ? 2 : 1*/; // channels | 145 | (*hdr).nChannels = wavChannels;// ? 2 : 1*/; // channels |
146 | 146 | ||
147 | (*hdr).sampleRate = wavSampleRate; //samples per second | 147 | (*hdr).sampleRate = wavSampleRate; //samples per second |
148 | (*hdr).avgBytesPerSec = (wavSampleRate)*( wavChannels*(wavResolution/8)); // bytes per second | 148 | (*hdr).avgBytesPerSec = (wavSampleRate)*( wavChannels*(wavResolution/8)); // bytes per second |
149 | (*hdr).nBlockAlign = wavChannels*( wavResolution/8); //block align | 149 | (*hdr).nBlockAlign = wavChannels*( wavResolution/8); //block align |
150 | (*hdr).bitsPerSample = wavResolution; //bits per sample 8, or 16 | 150 | (*hdr).bitsPerSample = wavResolution; //bits per sample 8, or 16 |
151 | 151 | ||
152 | strncpy((*hdr).dataID, "data", 4); | 152 | strncpy((*hdr).dataID, "data", 4); |
153 | 153 | ||
154 | write( fd,hdr, sizeof(*hdr)); | 154 | write( fd,hdr, sizeof(*hdr)); |
155 | odebug << "writing header: bitrate " << wavResolution << ", samplerate " << wavSampleRate << ", channels " << wavChannels << oendl; | 155 | owarn << "writing header: bitrate " << wavResolution << ", samplerate " << wavSampleRate << ", channels " << wavChannels << oendl; |
156 | return true; | 156 | return true; |
157 | } | 157 | } |
158 | 158 | ||
159 | bool WavFile::adjustHeaders(int fd, int total) { | 159 | bool WavFile::adjustHeaders(int fd, int total) { |
160 | lseek(fd, 4, SEEK_SET); | 160 | lseek(fd, 4, SEEK_SET); |
161 | int i = total + 36; | 161 | int i = total + 36; |
162 | write( fd, &i, sizeof(i)); | 162 | write( fd, &i, sizeof(i)); |
163 | lseek( fd, 40, SEEK_SET); | 163 | lseek( fd, 40, SEEK_SET); |
164 | write( fd, &total, sizeof(total)); | 164 | write( fd, &total, sizeof(total)); |
165 | odebug << "adjusting header " << total << "" << oendl; | 165 | owarn << "adjusting header " << total << "" << oendl; |
166 | return true; | 166 | return true; |
167 | } | 167 | } |
168 | 168 | ||
169 | int WavFile::parseWavHeader(int fd) { | 169 | int WavFile::parseWavHeader(int fd) { |
170 | odebug << "Parsing wav header" << oendl; | 170 | owarn << "Parsing wav header" << oendl; |
171 | char string[4]; | 171 | char string[4]; |
172 | int found; | 172 | int found; |
173 | short fmt; | 173 | short fmt; |
174 | unsigned short ch, bitrate; | 174 | unsigned short ch, bitrate; |
175 | unsigned long samplerrate, longdata; | 175 | unsigned long samplerrate, longdata; |
176 | 176 | ||
177 | if (read(fd, string, 4) < 4) { | 177 | if (read(fd, string, 4) < 4) { |
178 | odebug << " Could not read from sound file." << oendl; | 178 | owarn << " Could not read from sound file." << oendl; |
179 | return -1; | 179 | return -1; |
180 | } | 180 | } |
181 | if (strncmp(string, "RIFF", 4)) { | 181 | if (strncmp(string, "RIFF", 4)) { |
182 | odebug << " not a valid WAV file." << oendl; | 182 | owarn << " not a valid WAV file." << oendl; |
183 | return -1; | 183 | return -1; |
184 | } | 184 | } |
185 | lseek(fd, 4, SEEK_CUR); | 185 | lseek(fd, 4, SEEK_CUR); |
186 | if (read(fd, string, 4) < 4) { | 186 | if (read(fd, string, 4) < 4) { |
187 | odebug << "Could not read from sound file." << oendl; | 187 | owarn << "Could not read from sound file." << oendl; |
188 | return -1; | 188 | return -1; |
189 | } | 189 | } |
190 | if (strncmp(string, "WAVE", 4)) { | 190 | if (strncmp(string, "WAVE", 4)) { |
191 | odebug << "not a valid WAV file." << oendl; | 191 | owarn << "not a valid WAV file." << oendl; |
192 | return -1; | 192 | return -1; |
193 | } | 193 | } |
194 | found = 0; | 194 | found = 0; |
195 | 195 | ||
196 | while (!found) { | 196 | while (!found) { |
197 | if (read(fd, string, 4) < 4) { | 197 | if (read(fd, string, 4) < 4) { |
198 | odebug << "Could not read from sound file." << oendl; | 198 | owarn << "Could not read from sound file." << oendl; |
199 | return -1; | 199 | return -1; |
200 | } | 200 | } |
201 | if (strncmp(string, "fmt ", 4)) { | 201 | if (strncmp(string, "fmt ", 4)) { |
202 | if (read(fd, &longdata, 4) < 4) { | 202 | if (read(fd, &longdata, 4) < 4) { |
203 | odebug << "Could not read from sound file." << oendl; | 203 | owarn << "Could not read from sound file." << oendl; |
204 | return -1; | 204 | return -1; |
205 | } | 205 | } |
206 | lseek(fd, longdata, SEEK_CUR); | 206 | lseek(fd, longdata, SEEK_CUR); |
207 | } else { | 207 | } else { |
208 | lseek(fd, 4, SEEK_CUR); | 208 | lseek(fd, 4, SEEK_CUR); |
209 | if (read(fd, &fmt, 2) < 2) { | 209 | if (read(fd, &fmt, 2) < 2) { |
210 | odebug << "Could not read format chunk." << oendl; | 210 | owarn << "Could not read format chunk." << oendl; |
211 | return -1; | 211 | return -1; |
212 | } | 212 | } |
213 | if (fmt != WAVE_FORMAT_PCM && fmt != WAVE_FORMAT_DVI_ADPCM) { | 213 | if (fmt != WAVE_FORMAT_PCM && fmt != WAVE_FORMAT_DVI_ADPCM) { |
214 | odebug << "Wave file contains unknown format. Unable to continue." << oendl; | 214 | owarn << "Wave file contains unknown format. Unable to continue." << oendl; |
215 | return -1; | 215 | return -1; |
216 | } | 216 | } |
217 | wavFormat = fmt; | 217 | wavFormat = fmt; |
218 | // compressionFormat=fmt; | 218 | // compressionFormat=fmt; |
219 | odebug << "compressionFormat is " << fmt << "" << oendl; | 219 | owarn << "compressionFormat is " << fmt << "" << oendl; |
220 | if (read(fd, &ch, 2) < 2) { | 220 | if (read(fd, &ch, 2) < 2) { |
221 | odebug << "Could not read format chunk." << oendl; | 221 | owarn << "Could not read format chunk." << oendl; |
222 | return -1; | 222 | return -1; |
223 | } else { | 223 | } else { |
224 | wavChannels = ch; | 224 | wavChannels = ch; |
225 | odebug << "File has " << ch << " channels" << oendl; | 225 | owarn << "File has " << ch << " channels" << oendl; |
226 | } | 226 | } |
227 | if (read(fd, &samplerrate, 4) < 4) { | 227 | if (read(fd, &samplerrate, 4) < 4) { |
228 | odebug << "Could not read from format chunk." << oendl; | 228 | owarn << "Could not read from format chunk." << oendl; |
229 | return -1; | 229 | return -1; |
230 | } else { | 230 | } else { |
231 | wavSampleRate = samplerrate; | 231 | wavSampleRate = samplerrate; |
232 | // sampleRate = samplerrate; | 232 | // sampleRate = samplerrate; |
233 | odebug << "File has samplerate of " << (int) samplerrate << "" << oendl; | 233 | owarn << "File has samplerate of " << (int) samplerrate << "" << oendl; |
234 | } | 234 | } |
235 | lseek(fd, 6, SEEK_CUR); | 235 | lseek(fd, 6, SEEK_CUR); |
236 | if (read(fd, &bitrate, 2) < 2) { | 236 | if (read(fd, &bitrate, 2) < 2) { |
237 | odebug << "Could not read format chunk." << oendl; | 237 | owarn << "Could not read format chunk." << oendl; |
238 | return -1; | 238 | return -1; |
239 | } else { | 239 | } else { |
240 | wavResolution=bitrate; | 240 | wavResolution=bitrate; |
241 | // resolution = bitrate; | 241 | // resolution = bitrate; |
242 | odebug << "File has bitrate of " << bitrate << "" << oendl; | 242 | owarn << "File has bitrate of " << bitrate << "" << oendl; |
243 | } | 243 | } |
244 | found++; | 244 | found++; |
245 | } | 245 | } |
246 | } | 246 | } |
247 | found = 0; | 247 | found = 0; |
248 | while (!found) { | 248 | while (!found) { |
249 | if (read(fd, string, 4) < 4) { | 249 | if (read(fd, string, 4) < 4) { |
250 | odebug << "Could not read from sound file." << oendl; | 250 | odebug << "Could not read from sound file." << oendl; |
251 | return -1; | 251 | return -1; |
252 | } | 252 | } |
253 | 253 | ||
254 | if (strncmp(string, "data", 4)) { | 254 | if (strncmp(string, "data", 4)) { |