fix irregularity with adpcm and bits

4 files changed, 105 insertions, 97 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
@@ -13,188 +13,192 @@
 #include <stdlib.h>
 #include <sys/ioctl.h>
 #include <sys/soundcard.h>
 #include <unistd.h>
 #include <sys/wait.h>
 #include <unistd.h>
 #include <errno.h>
 
 //extern QtRec *qperec;
 #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
 
 Device::Device( QObject * parent, bool record )
         : QObject( parent)
 {
 //    dspstr = dsp;
     devForm = -1;
     devCh = -1;
     devRate = -1;
 
     if( !record){ //playing
-        owarn << "setting up DSP for playing" << oendl;
-        flags = O_WRONLY;
+        owarn << "New Sound device DSP for playing" << oendl;
+        flags = O_RDWR;
+//        flags = O_WRONLY;
     } else { //recording
-        owarn << "setting up DSP for recording" << oendl;
+        owarn << "New Sound device DSP for recording" << oendl;
         flags = O_RDWR;
 //        flags = O_RDONLY;
 				selectMicInput();
     }
 }
 
 bool Device::openDsp() {
+		qWarning("Device::openDsp()");
     if( openDevice( flags) == -1) {
         perror("<<<<<<<<<<<<<<ioctl(\"Open device\")");
         return false;
     }
     return true;
 }
 
 int Device::openDevice( int flags) {
-		owarn << "Opening"<< dspstr;
+		owarn << "Opening sound device:"<< DSPSTROUT << oendl;
 
-		if (( sd = ::open( DSPSTROUT, flags)) == -1) {
-				perror("open(\"/dev/dsp\")");
+		if (( sd = ::open( DSPSTROUT, O_RDWR)) == -1) {
+				perror("open(\"/dev/dsp\")\n");
 				QString errorMsg="Could not open audio device\n /dev/dsp\n"
 						+(QString)strerror(errno);
 				qDebug( "XXXXXXXXXXXXXXXXXXXXXXX  "+errorMsg );
 				return -1;
 		}
 
 		if(ioctl(sd,SNDCTL_DSP_RESET,0)<0){
 				perror("ioctl RESET");
 		}
+		qWarning("opened!");
     return sd;
 }
 
 int Device::getInVolume() {
     unsigned int volume = 0;
     Config cfg("qpe");
     cfg.setGroup("Volume");
 
     return cfg.readNumEntry("Mic");
 }
 
 int Device::getOutVolume( ) {
     unsigned int volume;
     Config cfg("qpe");
     cfg.setGroup("Volume");
 
     return cfg.readNumEntry("VolumePercent");
 }
 
 
 void Device::changedInVolume(int vol ) {
 		Config cfg("qpe");
 		cfg.setGroup("Volume");
 		cfg.writeEntry("Mic", QString::number(vol ));
 		QCopEnvelope( "QPE/System", "micChange(bool)" ) << false;
 }
 
 void Device::changedOutVolume(int vol) {
 		Config cfg("qpe");
 		cfg.setGroup("Volume");
 		cfg.writeEntry("VolumePercent", QString::number( vol ));
 
 		QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << false;
 
 		owarn << "changing output vol " << vol << oendl;
 }
 
 bool Device::selectMicInput() {
 
 		int md = 0;
 		int info = SOUND_MASK_MIC;//MIXER_WRITE(SOUND_MIXER_MIC);
 		owarn << "sectMicInput" << oendl;
 		md = ::open( DSPSTRMIXEROUT, O_RDWR );
 
 		if ( md <= 0) {
 				QString err;
 				err.sprintf("open %s", DSPSTRMIXEROUT);
 				perror(err.latin1());
 		} else {
 				if( ioctl( md, SOUND_MIXER_WRITE_RECSRC, &info) == -1)
 						perror("ioctl(\"SOUND_MIXER_WRITE_RECSRC\")");
 				::close(md);
 				return false;
 		}
 		::close(md);
 
     return true;
 }
 
 bool Device::closeDevice( bool) {
+		if(sd)
     ::close( sd); //close sound device
     return true;
 }
 
 bool Device::setDeviceFormat( int form) {
     qDebug( "set device res %d: %d ",form, sd );
     if (ioctl( sd, SNDCTL_DSP_SETFMT,  &form)==-1) { //set format
         perror("ioctl(\"SNDCTL_DSP_SETFMT\")");
         return false;
     }
     devRes=form;
     return true;
 }
 
 bool Device::setDeviceChannels( int ch) {
     qDebug( "set channels %d: %d",ch ,sd);
     if (ioctl( sd, SNDCTL_DSP_CHANNELS, &ch)==-1) {
         perror("ioctl(\"SNDCTL_DSP_CHANNELS\")");
         return false;
     }
     devCh=ch;
     return true;
 }
 
 bool Device::setDeviceRate( int rate) {
     qDebug( "set rate %d: %d",rate,sd);
     if (ioctl( sd, SNDCTL_DSP_SPEED, &rate) == -1) {
         perror("ioctl(\"SNDCTL_DSP_SPEED\")");
         return false;
     }
 
     devRate=rate;
 
     return true;
 }
 
 int Device::getRes() {
     return devRes;
 }
 
 int Device::getFormat() {
     return devForm;
 }
 
 int Device::getRate() {
     return devRate;
 }
 
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
@@ -1,38 +1,39 @@
 CONFIG   = qt quick-app
 HEADERS   = adpcm.h \
 	pixmaps.h \
 	helpwindow.h \
 	qtrec.h \
 	device.h \
 	wavFile.h \
 	waveform.h
 SOURCES   = adpcm.c \
 	helpwindow.cpp \
 	main.cpp \
 	qtrec.cpp \
 	device.cpp \
 	wavFile.cpp \
 	waveform.cpp
 INTERFACES  =
 
 contains(CONFIG, pdaudio) {
 #  LIBS += -L/opt/buildroot-opie/output/staging/target/lib -lqpe -lpthread -ljpeg -lpng -lz
   LIBS += -L$(QPEDIR)/lib -lqpe -lpthread -ljpeg -lpng -lz -lopiecore2
   INCLUDEPATH += $(QPEDIR)/include
   DEPENDPATH  += $(QPEDIR)/include
   DEFINES += PDAUDIO
   DEFINES += THREADED
   TARGET    = qperec
 
 #  DESTDIR=$(QPEDIR)/bin
 }
 
 !contains(CONFIG, pdaudio) {
   INCLUDEPATH += $(OPIEDIR)/include
   DEPENDPATH  += $(OPIEDIR)/include
   LIBS            += -lqpe -lopiecore2 -lpthread
+  DEFINES += THREADED
   TARGET    = opierec
   include( $(OPIEDIR)/include.pro )
 }
 
 
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
@@ -72,412 +72,414 @@ typedef struct {
 		int sampleRate;
 			/*      int fragSize; */
 			/*      int blockSize; */
 		int resolution; //bitrate
 		int channels; //number of channels
 		int fd; //file descriptor
 		int sd; //sound device descriptor
 		int numberSamples; //total number of samples
 		int SecondsToRecord; // number of seconds that should be recorded
 		float numberOfRecordedSeconds; //total number of samples recorded
 		int samplesToRecord; //number of samples to be recorded
 		int inVol; //input volume
 		int outVol; //output volume
 		int format; //wavfile format PCM.. ADPCM
 		const  char *fileName; //name of fiel to be played/recorded
 } fileParameters;
 
 fileParameters filePara;
 
 bool monitoring, recording, playing;
 bool stopped;
 QLabel *timeLabel;
 QSlider *timeSlider;
 int sd;
 
 Waveform* waveform;
 Device *soundDevice;
 
 
 #ifdef THREADED
 void quickRec()
 #else
 		void QtRec::quickRec()
 #endif
 {
 
 		odebug << ( filePara.numberSamples/filePara.sampleRate * filePara.channels ) << oendl;
 		odebug << "samples " << filePara.numberSamples << ", rate " << filePara.sampleRate
 					 << ", channels " << filePara.channels << oendl;
 
 		int total = 0;  // Total number of bytes read in so far.
 		int bytesWritten, number;
 
 		bytesWritten = 0;
 		number = 0;
 		QString num;
 		int level = 0;
 		int threshold = 0;
-   int bits = filePara.resolution;
-   odebug << "bits " << bits << "" << oendl;
+		int bits = filePara.resolution;
+		odebug << "bits " << bits << "" << oendl;
 
 		if( filePara.resolution == 16 ) { //AFMT_S16_LE)
-       odebug << "AFMT_S16_LE size " << filePara.SecondsToRecord << "" << oendl;
-       odebug << "samples to record " << filePara.samplesToRecord << "" << oendl;
-       odebug << "" << filePara.sd << "" << oendl;
+				odebug << "AFMT_S16_LE size " << filePara.SecondsToRecord << "" << oendl;
+				odebug << "samples to record " << filePara.samplesToRecord << "" << oendl;
+				odebug << "" << filePara.sd << "" << oendl;
 				level = 7;
 				threshold = 0;
 
 				if( filePara.format == WAVE_FORMAT_DVI_ADPCM) {
-          odebug << "start recording WAVE_FORMAT_DVI_ADPCM" << oendl;
+						odebug << "start recording WAVE_FORMAT_DVI_ADPCM" << oendl;
 // <<<<<<<<<<<<<<<<<<<<<<<<<<<  WAVE_FORMAT_DVI_ADPCM  >>>>>>>>>>>>>>>>>>>>>>
 						char abuf[ BUFSIZE/2 ];
 						short sbuf[ BUFSIZE ];
 						short sbuf2[ BUFSIZE ];
 						memset( abuf, 0, BUFSIZE/2);
 						memset( sbuf, 0, BUFSIZE);
 						memset( sbuf2, 0, BUFSIZE);
 
 						for(;;) {
 								if ( stopped) {
 										odebug << "quickRec:: stopped" << oendl;
 										break;
 								}
 
 //             number=::read( filePara.sd, sbuf, BUFSIZE);
 								number =  soundDevice->devRead( filePara.sd, sbuf, BUFSIZE);
 
 								if(number <= 0) {
 										perror("recording error ");
 										odebug << "" << filePara.fileName << " " << number << "" << oendl;
 										stopped = true;
 										return;
 								}
 									//if(stereo == 2) {
 //        adpcm_coder( sbuf2, abuf, number/2, &encoder_state);
 								adpcm_coder( sbuf, abuf, number/2, &encoder_state);
 
-								bytesWritten = ::write( filePara.fd , (short *)abuf, number/4);
+								bytesWritten = ::write( filePara.fd , abuf, number/4);
 
 								waveform->newSamples( sbuf, number );
 
 								total += bytesWritten;
 								filePara.numberSamples = total;
 								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);
 
-				 filePara.numberOfRecordedSeconds = (float)total / (float)filePara.sampleRate * (float)2	/ filePara.channels;
+								filePara.numberOfRecordedSeconds = (float)total / (float)filePara.sampleRate * (float)2;//	/ filePara.channels;
 
 								qApp->processEvents();
 								if( total >= filePara.samplesToRecord) {
 										stopped = true;
 										break;
 								}
 						}
 				} else {
 							// <<<<<<<<<<<<<<<<<<<<<<<<<<<  WAVE_FORMAT_PCM   >>>>>>>>>>>>>>>>>>>>>>
 						odebug << "start recording WAVE_FORMAT_PCM" << oendl;
 						short inbuffer[ BUFSIZE ], outbuffer[ BUFSIZE ];
 						memset( inbuffer, 0, BUFSIZE);
 						memset( outbuffer, 0, BUFSIZE);
 
 						for(;;) {
 								if ( stopped) {
 										odebug << "quickRec:: stopped" << oendl;
 										stopped = true;
 										break;  // stop if playing was set to false
 										return;
 								}
 
 								number = soundDevice->devRead( soundDevice->sd /*filePara.sd*/, (short *)inbuffer, BUFSIZE);
 
 								if( number <= 0) {
 										perror( "recording error ");
 										odebug << filePara.fileName << oendl;
 										stopped = true;
 										return;
 								}
 
 								bytesWritten = ::write( filePara.fd , inbuffer, number);
 								waveform->newSamples( inbuffer, number );
 
 								if( bytesWritten < 0) {
 										perror("File writing error ");
 										stopped = true;
 										return;
 								}
 
 								total += bytesWritten;
 
 								filePara.numberSamples = total;
 
 								if( filePara.SecondsToRecord != 0)
 										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);
 
 								filePara.numberOfRecordedSeconds = (float)total / (float)filePara.sampleRate
 										/ (float)2/filePara.channels;
 								qApp->processEvents();
 
 								if( total >= filePara.samplesToRecord) {
 										stopped = true;
 										break;
 								}
 						}
 				} //end main loop
 
 		} else {
 // <<<<<<<<<<<<<<<<<<<<<<<   format = AFMT_U8;
 				unsigned char unsigned_inbuffer[ BUFSIZE ], unsigned_outbuffer[ BUFSIZE ];
 				memset( unsigned_inbuffer, 0, BUFSIZE);
 				memset( unsigned_outbuffer, 0, BUFSIZE);
 
 				for(;;) {
 						if ( stopped) {
 								odebug << "quickRec:: stopped" << oendl;
 								break;  // stop if playing was set to false
 						}
 
 						number = ::read( soundDevice->sd /*filePara.sd*/ , unsigned_inbuffer, BUFSIZE);
 						bytesWritten = ::write( filePara.fd , unsigned_inbuffer, number);
             waveform->newSamples( (const short *) unsigned_inbuffer, number );
 
 						if(bytesWritten < 0) {
 								stopped = true;
 								QMessageBox::message("Note","<p>There was a problem writing to the file</p>");
 								perror("File writing error ");
 								return;
 						}
 
 						total += bytesWritten;
 						filePara.numberSamples = total;
 							//             printf("%d, bytes %d,total %d \r",number,  bytesWritten , total);
 							//             fflush(stdout);
 						if( filePara.SecondsToRecord !=0)
 								timeSlider->setValue( total);
 
 						filePara.numberOfRecordedSeconds = (float)total / (float)filePara.sampleRate;
 
 						qApp->processEvents();
 						if( total >= filePara.samplesToRecord) {
 								stopped = true;
 								break;
 						}
 				} //end main loop
 		}
 		printf("\n");
 } /// END quickRec()
 
 
 #ifdef THREADED
 void playIt()
 #else
 		void QtRec::playIt()
 #endif
 {
 		int bytesWritten = 0;
 		int number = 0;
 		int total = 0;  // Total number of bytes read in so far.
 		if( filePara.resolution == 16 ) { //AFMT_S16_LE) {
 				if( filePara.format == WAVE_FORMAT_DVI_ADPCM) {
 						char abuf[ BUFSIZE / 2 ];
 						short sbuf[ BUFSIZE ];
 						short sbuf2[ BUFSIZE * 2 ];
 						memset( abuf, 0, BUFSIZE / 2);
 						memset( sbuf, 0, BUFSIZE);
 						memset( sbuf2, 0, BUFSIZE * 2);
 // <<<<<<<<<<<<<<<<<<<<<<<<<<<  WAVE_FORMAT_DVI_ADPCM  >>>>>>>>>>>>>>>>>>>>>>
 						for(;;) {  // play loop
 								if ( stopped) {
 										break;
 										return;
 								}// stop if playing was set to false
 
 								number = ::read( filePara.fd, abuf, BUFSIZE / 2);
 								adpcm_decoder( abuf, sbuf, number * 2, &decoder_state);
 
 //                 for (int i=0;i< number * 2; 2 * i++) { //2*i is left channel
 //                     sbuf2[i+1]=sbuf2[i]=sbuf[i];
 //                 }
-								bytesWritten = write ( filePara.sd, sbuf, number * 4);
-								waveform->newSamples( (const short *)sbuf, number *4);
+								bytesWritten = write ( soundDevice->sd , sbuf, number * 4);
+
+								waveform->newSamples( sbuf, number );
+
 									//          if(filePara.channels==1)
 									//              total += bytesWritten/2; //mono
 									//          else
 								total += bytesWritten;
 								filePara.numberSamples = total/4;
 								filePara.numberOfRecordedSeconds = (float)total / (float)filePara.sampleRate / 2;
 
 								timeSlider->setValue( total/4);
 //            timeString.sprintf("%.2f", filePara.numberOfRecordedSeconds);
 //         if(filePara.numberOfRecordedSeconds>1)
 //            timeLabel->setText( timeString+ tr(" seconds"));
 //                              printf("playing number %d, bytes %d, total %d\n",number,  bytesWritten, total/4);
 //                              fflush(stdout);
 
 								qApp->processEvents();
 
 								if( /*total >= filePara.numberSamples || */ bytesWritten == 0) {
 //            if( total >= filePara.numberSamples ){//||  secCount > filePara.numberOfRecordedSeconds ) {
 										stopped = true;
 										break;
 								}
 						}
 				} else {
 							// <<<<<<<<<<<<<<<<<<<<<<<<<<<  WAVE_FORMAT_PCM   >>>>>>>>>>>>>>>>>>>>>>
 						short inbuffer[ BUFSIZE ], outbuffer[ BUFSIZE ];
 						memset( inbuffer, 0, BUFSIZE);
 						memset( outbuffer, 0, BUFSIZE);
 
 						for(;;) {  // play loop
 								if ( stopped) {
 										break;
 										return;
 								}
 // stop if playing was set to false
 								number = ::read( filePara.fd, inbuffer, BUFSIZE);
 //                 for (int i=0;i< number * 2; 2 * i++) { //2*i is left channel
 //                       //        for (int i=0;i< number ; i++) { //2*i is left channel
 //                     outbuffer[i+1]= outbuffer[i]=inbuffer[i];
 //                 }
-								bytesWritten = ::write( filePara.sd, inbuffer, number);
+								bytesWritten = ::write( soundDevice->sd, inbuffer, number);
 								waveform->newSamples( inbuffer, number);
 									//-------------->>>> out to device
 									//        total+=bytesWritten;
 									//          if(filePara.channels==1)
 									//              total += bytesWritten/2; //mono
 									//          else
 								total += bytesWritten;
 								timeSlider->setValue( total);
 
 								filePara.numberSamples = total;
 								filePara.numberOfRecordedSeconds = (float)total / (float)filePara.sampleRate / (float)2;
 
 //             timeString.sprintf("%.2f",filePara.numberOfRecordedSeconds);
 //             timeLabel->setText( timeString + tr(" seconds"));
 
 								qApp->processEvents();
 
 								if( /*total >= filePara.numberSamples || */ bytesWritten == 0) {
 										owarn << "Jane! Stop this crazy thing!" << oendl;
 										stopped = true;
 //                playing = false;
 										break;
 								}
 						}
 //             printf("\nplaying number %d, bytes %d, total %d\r",number,  bytesWritten, total);
 //             fflush(stdout);
 				} //end loop
 		} else {
 /////////////////////////////// format = AFMT_U8;
 				unsigned char unsigned_inbuffer[ BUFSIZE ]; //, unsigned_outbuffer[BUFSIZE];
 				memset( unsigned_inbuffer, 0, BUFSIZE);
 				for(;;) {
 // main loop
 						if (stopped) {
 								break;  // stop if playing was set to false
 								return;
 						}
 						number = ::read( filePara.fd, unsigned_inbuffer, BUFSIZE);
 //data = (val >> 8) ^ 0x80;
 							//          unsigned_outbuffer = (unsigned_inbuffer >> 8) ^ 0x80;
 						bytesWritten = write ( filePara.sd, unsigned_inbuffer, number);
 						waveform->newSamples(  (const short *)unsigned_inbuffer, bytesWritten );
 						total += bytesWritten;
 
             timeSlider->setValue( total);
 						filePara.numberSamples = total;
 
 						filePara.numberOfRecordedSeconds = (float)total / (float)filePara.sampleRate;
 //          timeString.sprintf("%.2f",filePara.numberOfRecordedSeconds);
 //          timeLabel->setText( timeString + tr(" seconds"));
 						qApp->processEvents();
 
 						if( /*total >= filePara.numberSamples || */ bytesWritten == 0) {
 //         if( total >= filePara.numberSamples ) {
 								stopped = true;
 								break;
 						}
 //                      printf("Writing number %d, bytes %d, total %d, numberSamples %d\r",number,  bytesWritten , total, filePara.numberSamples);
 //                      fflush(stdout);
 				}
 		}
 }
 
 
 QtRec::QtRec( QWidget* parent,  const char* name, WFlags fl )
 				: QWidget( parent, name, fl )
 {
 		if ( !name )
 				setName( "OpieRec" );
 		init();
 		initConfig();
 		initConnections();
 		renameBox = 0;
 
 // open sound device to get volumes
 		Config hwcfg("OpieRec");
 		hwcfg.setGroup("Hardware");
 
 
 		soundDevice = new Device( this, false); //open play
 
 		getInVol();
 		getOutVol();
 
 		soundDevice->closeDevice( true);
 		soundDevice->sd = -1;
 		soundDevice = 0;
 		wavFile = 0;
 //      if( soundDevice) delete soundDevice;
-	 QTimer::singleShot(100,this, SLOT(initIconView()));
+		QTimer::singleShot(100,this, SLOT(initIconView()));
 
 		if( autoMute)
 				doMute( true);
 //		ListView1->setFocus();
 		playing = false;
 }
 
 QtRec::~QtRec() {
 //   if( soundDevice) delete soundDevice;
 
 }
 
 void QtRec::cleanUp() {
 
 		if( !stopped) {
 				stopped = true;
 				endRecording();
 		}
 
 		ListView1->clear();
 
 		if( autoMute)
 				doMute(false);
 
 //      if( wavFile) delete wavFile;
 // if(soundDevice) delete soundDevice;
 }
 
 void QtRec::init() {
 
 		needsStereoOut = false;
 		QPixmap image3( ( const char** ) image3_data );
 		QPixmap image4( ( const char** ) image4_data );
 		QPixmap image6( ( const char** ) image6_data );
 
 		stopped = true;
 		setCaption( tr( "OpieRecord " ));
 		QGridLayout *layout = new QGridLayout( this );
 		layout->setSpacing( 2);
 		layout->setMargin( 2);
 
 		TabWidget = new QTabWidget( this, "TabWidget" );
 		layout->addMultiCellWidget(TabWidget, 0, 7, 0, 8);
 //    TabWidget->setTabShape(QTabWidget::Triangular);
 
 			///**********<<<<<<<<<<<<>>>>>>>>>>>>***************
 		tab = new QWidget( TabWidget, "tab" );
 
@@ -743,98 +745,98 @@ void QtRec::initConnections() {
 		connect(timeSlider,SIGNAL(sliderPressed()),this,SLOT(timeSliderPressed()));
 		connect(timeSlider,SIGNAL(sliderReleased()),this,SLOT(timeSliderReleased()));
 
 		connect(compressionCheckBox,SIGNAL(toggled(bool)),this,SLOT(compressionSelected(bool)));
 		connect(autoMuteCheckBox,SIGNAL(toggled(bool)),this,SLOT(slotAutoMute(bool)));
 }
 
 void QtRec::initConfig() {
 		int index, fred, i;
 		Config cfg("OpieRec");
 		cfg.setGroup("Settings");
 
 		index = cfg.readNumEntry("samplerate",22050);
 		bool ok;
 
 		for(int ws=0;ws<sampleRateComboBox->count();ws++) {
 				fred = sampleRateComboBox->text(ws).toInt(&ok, 10);
 				if( index == fred) {
 						filePara.sampleRate  = fred;
 						sampleRateComboBox->setCurrentItem(ws);
 				}
 		}
 
 		i = cfg.readNumEntry("bitrate",16);
 		if(i == 16)
 				bitRateComboBox->setCurrentItem( 1);
 		else    if(i == 24)
 				bitRateComboBox->setCurrentItem( 2);
 		else    if(i == 32)
 				bitRateComboBox->setCurrentItem( 3);
 		else
 				bitRateComboBox->setCurrentItem( 0);
 
 		filePara.resolution = i;
 
 		i = cfg.readNumEntry("sizeLimit", 5 );
 		QString temp;
 		sizeLimitCombo->setCurrentItem((i/5));
 
 		stereoCheckBox->setChecked( cfg.readBoolEntry("stereo", 1));
 		if( stereoCheckBox->isChecked()) {
 				filePara.channels = 2;
 		} else {
 				filePara.channels = 1;
 		}
 
 		compressionCheckBox->setChecked( cfg.readBoolEntry("wavCompression",1));
 		if( compressionCheckBox->isChecked()) {
+				bitRateComboBox->setCurrentItem(1);
 				bitRateComboBox->setEnabled(false);
-				bitRateComboBox->setCurrentItem(0);
 				filePara.resolution=16;
 		}
 
 		autoMuteCheckBox->setChecked( cfg.readBoolEntry("useAutoMute",0));
 		if( autoMuteCheckBox->isChecked())
 				slotAutoMute(true);
 		else
 				slotAutoMute(false);
 
 		Config cofg( "qpe");
 		cofg.setGroup( "Volume");
 		outMuteCheckBox->setChecked( cofg.readBoolEntry( "Mute",0));
 		inMuteCheckBox->setChecked( cofg.readBoolEntry( "MicMute",0));
 }
 
 void QtRec::stop() {
 //		owarn << "STOP" << oendl;
 		setRecordButton(false);
 
 		if( !recording)
 				endPlaying();
 		else
 				endRecording();
 		timeSlider->setValue(0);
 }
 
 void QtRec::doPlayBtn() {
 
 		if(!stopped) {
 //				playLabel2->setText(tr("Play"));
 				stop();
 		} else {
 				if(ListView1->currentItem() == 0) return;
 //				playLabel2->setText(tr("Stop"));
 				currentFile = ListView1->currentItem()->text(0);
 				start();
 		}
 }
 
 void QtRec::start() { //play
 		if( stopped) {
 				QPixmap image3( ( const char** ) image3_data );
 				Stop_PushButton->setPixmap( image3 );
 				Stop_PushButton->setDown( true);
 				stopped = false;
 				paused = false;
 				secCount = 1;
 
@@ -1003,97 +1005,97 @@ bool QtRec::setupAudio( bool b) {
 				if( filePara.resolution == 16 || compressionCheckBox->isChecked() ) {
 						sampleformat = AFMT_S16_LE;
 						filePara.resolution = 16;
 				} else {
 						sampleformat = AFMT_U8;
 						filePara.resolution = 8;
 				}
 #endif
 
 				stereo = filePara.channels;
 				flags = O_WRONLY;
 				recording = false;
 		} else { // we want to record
 
 #ifdef PDAUDIO //ALSA
 				if( !bitRateComboBox->isEnabled() || bitRateComboBox->currentText() == "16")
 						sampleformat = SND_PCM_FORMAT_S16;
 				else if( !bitRateComboBox->isEnabled() || bitRateComboBox->currentText() == "24")
 						sampleformat = SND_PCM_FORMAT_S24;
 				else if( !bitRateComboBox->isEnabled() || bitRateComboBox->currentText() == "32")
 						sampleformat = SND_PCM_FORMAT_S32;
 				else
 						sampleformat = SND_PCM_FORMAT_U8;
 
 #else
 				if( !bitRateComboBox->isEnabled() || bitRateComboBox->currentText() == "16")
 						sampleformat = AFMT_S16_LE;
 				else
 						sampleformat = AFMT_U8;
 
 				if( !compressionCheckBox->isChecked()) {
 						filePara.format = WAVE_FORMAT_PCM;
 //          odebug << "WAVE_FORMAT_PCM" << oendl;
 				}  else {
 						filePara.format = WAVE_FORMAT_DVI_ADPCM;
 						sampleformat = AFMT_S16_LE;
 //          odebug << "WAVE_FORMAT_DVI_ADPCM" << oendl;
 				}
 #endif
 
 				stereo = filePara.channels;
 //        filePara.sampleRate = sampleRateComboBox->currentText().toInt( &ok,10);//44100;
 				flags= O_RDWR;
 //        flags= O_RDONLY;
 				recording = true;
 		}
 
 			// if(soundDevice) delete soundDevice;
-		odebug << "<<<<<<<<<<<<<<<<<<<open dsp " << filePara.sampleRate << " " << filePara.channels << " " << sampleformat << "" << oendl;
+		owarn << "<<<<<<<<<<<<<<<<<<<open dsp " << filePara.sampleRate << " " << filePara.channels << " " << sampleformat << "" << oendl;
 //		owarn << "change waveform settings" << oendl;
 		waveform->changeSettings( filePara.sampleRate, filePara.channels );
 
 		soundDevice = new Device( this, b); //open rec
 //    soundDevice->openDsp();
 		soundDevice->reset();
 
 		odebug << "device has been made " << soundDevice->sd << "" << oendl;
 
 			//////////////////         <<<<<<<<<<<<>>>>>>>>>>>>
 		soundDevice->setDeviceFormat( sampleformat);
 		soundDevice->setDeviceChannels( filePara.channels);
 		soundDevice->setDeviceRate( filePara.sampleRate);
 		soundDevice->getDeviceFragSize();
 #ifdef QT_QWS_EBX
 		int frag = FRAGSIZE;
 		soundDevice->setFragSize( frag);
 		soundDevice->getDeviceFragSize();
 #endif
 			/////////////////
 		filePara.sd = soundDevice->sd;
 
 		if ( filePara.sd == -1) {
 
 				monitoring = false;
 				stopped = true;
 				update();
 				setCaption( tr( "OpieRecord " )+ QString::number(VERSION) );
 				return false;
 		}
 		if(autoMute)
 				doMute(false);
 
 		return true;
 }
 
 
 bool QtRec::setUpFile() { //setup file for recording
 //    odebug << "Setting up wavfile" << oendl;
 //  if(wavFile) delete wavFile;
 		wavFile = new WavFile( this, (const QString &)"",
 													 true,
 													 filePara.sampleRate,
 													 filePara.channels,
 													 filePara.resolution,
 													 filePara.format);
 
 		filePara.fd = wavFile->wavHandle();
@@ -1185,128 +1187,128 @@ void QtRec::changeDirCombo(int index) {
 		StorageInfo storageInfo;
 		const QList<FileSystem> &fs = storageInfo.fileSystems();
 		QListIterator<FileSystem> it ( fs );
 		QString storage;
 		for( ; it.current(); ++it ){
 				if( sName == (*it)->name()+" "+  (*it)->path() ||
 						(*it)->name() == sName ) {
 						const QString path = (*it)->path();
 						recDir = path;
 						cfg.writeEntry("directory", recDir);
 						odebug << "new rec dir "+recDir << oendl;
 				}
 		}
 		cfg.write();
 }
 
 
 void QtRec::changeSizeLimitCombo(int) {
 		Config cfg("OpieRec");
 		cfg.setGroup("Settings");
 		cfg.writeEntry("sizeLimit", getCurrentSizeLimit() );
 		cfg.write();
 }
 
 void QtRec::newSound() {
 		if( !rec()) {
 				endRecording();
 				deleteSound();
 		}
 }
 
 void QtRec::itClick(QListViewItem *item) {
 		currentFile = item->text(0);
 		setCaption("OpieRecord  "+currentFile);
 }
 
 void QtRec::deleteSound() {
 		Config cfg("OpieRec");
 		cfg.setGroup("Sounds");
 		if( ListView1->currentItem() == NULL)
 				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
 			//		{
-					QString file = ListView1->currentItem()->text(0);
-					QString fileName;
-					fileName = cfg.readEntry( file, "");
-					QFile f( fileName);
-					if( f.exists())
-							if( !f.remove())
-									QMessageBox::message( tr("Error"), tr("Could not remove file."));
-
-					int nFiles = cfg.readNumEntry( "NumberofFiles",0);
-					bool found = false;
-					for(int i=0;i<nFiles+1;i++) {
-
-							if( cfg.readEntry( QString::number(i),"").find( file,0,true) != -1) {
-									found = true;
-									cfg.writeEntry( QString::number(i), cfg.readEntry( QString::number(i+1),""));
-							}
-							if(found)
-									cfg.writeEntry( QString::number(i), cfg.readEntry( QString::number(i+1),""));
-					}
-
-					cfg.removeEntry( cfg.readEntry( file));
-					cfg.removeEntry( file);
-					cfg.writeEntry( "NumberofFiles", nFiles-1);
-					cfg.write();
-
-					ListView1->takeItem( ListView1->currentItem() );
-					delete ListView1->currentItem();
-
-					ListView1->clear();
-					ListView1->setSelected( ListView1->firstChild(), true);
-					initIconView();
-					update();
+		QString file = ListView1->currentItem()->text(0);
+		QString fileName;
+		fileName = cfg.readEntry( file, "");
+		QFile f( fileName);
+		if( f.exists())
+				if( !f.remove())
+						QMessageBox::message( tr("Error"), tr("Could not remove file."));
+
+		int nFiles = cfg.readNumEntry( "NumberofFiles",0);
+		bool found = false;
+		for(int i=0;i<nFiles+1;i++) {
+
+				if( cfg.readEntry( QString::number(i),"").find( file,0,true) != -1) {
+						found = true;
+						cfg.writeEntry( QString::number(i), cfg.readEntry( QString::number(i+1),""));
+				}
+				if(found)
+						cfg.writeEntry( QString::number(i), cfg.readEntry( QString::number(i+1),""));
+		}
+
+		cfg.removeEntry( cfg.readEntry( file));
+		cfg.removeEntry( file);
+		cfg.writeEntry( "NumberofFiles", nFiles-1);
+		cfg.write();
+
+		ListView1->takeItem( ListView1->currentItem() );
+		delete ListView1->currentItem();
+
+		ListView1->clear();
+		ListView1->setSelected( ListView1->firstChild(), true);
+		initIconView();
+		update();
 		setCaption( tr( "OpieRecord " ));
 }
 
 void QtRec::keyPressEvent( QKeyEvent *e) {
 
 		switch ( e->key() ) {
 					//  case Key_F1:
 					//     if(stopped && !recording)
 					//       newSound();
 					//     else
 					//       stop();
 					//    break;
 					//   case Key_F2: {
 					//     if( !e->isAutoRepeat())
 					//     rewindPressed();
 					//   }
 					//     break;
 					//   case Key_F3: {
 					//     if( !e->isAutoRepeat())
 					//     FastforwardPressed();
 					//   }
 					//     break;
 
 					////////////////////////////// Zaurus keys
 			case Key_F9: //activity
 					break;
 			case Key_F10: //contacts
 					break;
 			case Key_F11: //menu
 					break;
 			case Key_F12: //home
 					break;
 			case Key_F13: //mail
 					break;
 			case Key_Space:
 					break;
 			case Key_Delete:
 					break;
 			case Key_Up:
 						//    stop();
 					break;
 			case Key_Down:
 						//    newSound();
 					break;
 			case Key_Left: {
 					odebug << "rewinding" << oendl;
 					if( !e->isAutoRepeat())
 							rewindPressed();
@@ -1364,174 +1366,174 @@ void  QtRec::keyReleaseEvent( QKeyEvent *e) {
 					odebug << "Up" << oendl;
 					break;
 			case Key_Down:
 						//      start();
 						//      odebug << "Down" << oendl;
 						//    newSound();
 					break;
 			case Key_Left:
 					odebug << "Left" << oendl;
 					rewindReleased();
 					break;
 			case Key_Right:
 					odebug << "Right" << oendl;
 					FastforwardReleased();
 					break;
 		}
 }
 
 void QtRec::endRecording() {
 		
 		monitoring = false;
 		recording = false;
 		stopped = true;
 		waveform->reset();
 		setRecordButton( false);
 
 		toBeginningButton->setEnabled( true);
 		toEndButton->setEnabled( true);
 
 		killTimers();
 
 		if(autoMute)
 				doMute( true);
 
 		soundDevice->closeDevice( true);
 
 		if( wavFile->track.isOpen()) {
 				wavFile->adjustHeaders( filePara.fd, filePara.numberSamples);
 					//    soundDevice->sd=-1;
 				filePara.numberSamples = 0;
 					//      filePara.sd=-1;
 				wavFile->closeFile();
 				filePara.fd=0;
 
 				if( wavFile->isTempFile()) {
 // move tmp file to regular file
 						QString cmd;
 						cmd.sprintf("mv "+ wavFile->trackName() + " " + wavFile->currentFileName);
-         odebug << "moving tmp file to "+currentFileName << oendl;
+						odebug << "moving tmp file to "+currentFileName << oendl;
 						system( cmd.latin1());
 				}
 
 				odebug << "Just moved " + wavFile->currentFileName << oendl;
 				Config cfg("OpieRec");
 				cfg.setGroup("Sounds");
 
 				int nFiles = cfg.readNumEntry( "NumberofFiles",0);
 
 				currentFile = QFileInfo( wavFile->currentFileName).fileName();
 				currentFile = currentFile.left( currentFile.length() - 4);
 
 				cfg.writeEntry( "NumberofFiles", nFiles + 1);
 				cfg.writeEntry( QString::number( nFiles + 1), currentFile);
 				cfg.writeEntry( currentFile, wavFile->currentFileName);
 
 				QString time;
 				time.sprintf("%.2f", filePara.numberOfRecordedSeconds);
 				cfg.writeEntry( wavFile->currentFileName, time );
-       odebug << "writing config numberOfRecordedSeconds "+time << oendl;
+				odebug << "writing config numberOfRecordedSeconds "+time << oendl;
 
 				cfg.write();
 				odebug << "finished recording" << oendl;
 //				timeLabel->setText("");
 		}
 
 //      if(soundDevice) delete soundDevice;
 
 		timeSlider->setValue(0);
 		initIconView();
 		selectItemByName( currentFile);
 		setCaption( tr( "OpieRecord " ));
 		
 }
 
 void QtRec::endPlaying() {
 		monitoring = false;
 		recording = false;
 		playing = false;
 		stopped = true;
 		waveform->reset();
 //   errorStop();
     odebug << "end playing" << oendl;
 		setRecordButton( false);
 
 		toBeginningButton->setEnabled( true);
 		toEndButton->setEnabled( true);
 
 		if(autoMute)
 				doMute( true);
 
 		soundDevice->closeDevice( false);
 		soundDevice->sd = -1;
 			//  if(soundDevice) delete soundDevice;
     odebug << "file and sound device closed" << oendl;
 //		timeLabel->setText("");
 		total = 0;
 		filePara.numberSamples = 0;
 		filePara.sd = -1;
 //   wavFile->closeFile();
 		filePara.fd = 0;
 //  if(wavFile) delete wavFile; //this crashes
 
     odebug << "track closed" << oendl;
 		killTimers();
 //		owarn << "reset slider" << oendl;
 		timeSlider->setValue(0);
 
 //      if(soundDevice) delete soundDevice;
 
 }
 
 bool QtRec::openPlayFile() {
-
+		qWarning("opening file");
 		qApp->processEvents();
 		if( currentFile.isEmpty()) {
-				QMessageBox::message(tr("Opierec"),tr("Please select file to  play"));
+				QMessageBox::message(tr("Opierec"),tr("Please select file to play"));
 				endPlaying();
 				return false;
 		}
 		QString currentFileName;
 		Config cfg("OpieRec");
 		cfg.setGroup("Sounds");
 		int nFiles = cfg.readNumEntry( "NumberofFiles", 0);
 		for(int i=0;i<nFiles+1;i++) { //look for file
 				if( cfg.readEntry( QString::number(i),"").find( currentFile,0,true) != -1) {
 						currentFileName = cfg.readEntry( currentFile, "" );
 						odebug << "opening for play: " + currentFileName << oendl;
 				}
 		}
 		wavFile = new WavFile(this,
 													currentFileName,
 													false);
 		filePara.fd = wavFile->wavHandle();
 		if(filePara.fd == -1) {
 					//  if(!track.open(IO_ReadOnly)) {
 				QString errorMsg = (QString)strerror(errno);
 				monitoring = false;
 				setCaption( tr( "OpieRecord " ));
 				QMessageBox::message(tr("Note"), tr("Could not open audio file.\n")
 														 + errorMsg + "\n" + currentFile);
 				return false;
 		} else {
 
 				filePara.numberSamples = wavFile->getNumberSamples();
 				filePara.format = wavFile->getFormat();
 				filePara.sampleRate = wavFile->getSampleRate();
 				filePara.resolution = wavFile->getResolution();
 				filePara.channels = wavFile->getChannels();
 				timeSlider->setPageStep(1);
 				monitoring = true;
 
 				odebug << "file " << filePara.fd << ", samples " << filePara.numberSamples << " " << filePara.sampleRate << "" << oendl;
 				int sec = (int) (( filePara.numberSamples / filePara.sampleRate) / filePara.channels) / ( filePara.channels*( filePara.resolution/8));
 
 //				owarn << "seconds " << sec << "" << oendl;
 
 				timeSlider->setRange(0, filePara.numberSamples );
 		}
 
 		return true;
 }
 
 void QtRec::listPressed( int mouse, QListViewItem *item, const QPoint &, int ) {
 		if(item == NULL )
@@ -1681,240 +1683,241 @@ bool QtRec::eventFilter( QObject * o, QEvent * e ) {
 								return true;
 						} else if ( ke->key() == Key_Escape ) {
 								cancelRename();
 								return true;
 						}
 				} else if ( e->type() == QEvent::FocusOut ) {
 						cancelRename();
 						return true;
 				}
 		}
 		return QWidget::eventFilter( o, e );
 }
 
 
 int QtRec::getCurrentSizeLimit() {
 		return  sizeLimitCombo->currentItem() * 5;
 }
 
 void QtRec::timerBreak() {
 		endPlaying();
 }
 
 void QtRec::doVolMuting(bool b) {
 		Config cfg( "qpe" );
 		cfg. setGroup( "Volume" );
 		cfg.writeEntry( "Mute",b);
 		cfg.write();
 		QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << b;
 }
 
 void QtRec::doMicMuting(bool b) {
 			//  odebug << "mic mute" << oendl;
 		Config cfg( "qpe" );
 		cfg. setGroup( "Volume" );
 		cfg.writeEntry( "MicMute",b);
 		cfg.write();
 		QCopEnvelope( "QPE/System", "micChange(bool)" ) << b;
 }
 
 void QtRec::compressionSelected(bool b) {
 		Config cfg("OpieRec");
 		cfg.setGroup("Settings");
 		cfg.writeEntry("wavCompression", b);
 		cfg.writeEntry("bitrate", 16);
 		filePara.resolution = 16;
 		cfg.write();
 
 		if(b) {
-				bitRateComboBox->setEnabled( false);
+				qWarning("set adpcm");
 				bitRateComboBox->setCurrentItem( 1);
+				bitRateComboBox->setEnabled( false);
 				filePara.resolution = 16;
 		} else{
 				bitRateComboBox->setEnabled( true);
 		}
 }
 
 long QtRec::checkDiskSpace(const QString &path) {
 
 		struct statfs fs;
 
 		if ( !statfs( path.latin1(), &fs ) ) {
 
 				int blkSize = fs.f_bsize;
 				int availBlks = fs.f_bavail;
 
 				long mult = blkSize / 1024;
 				long div = 1024 / blkSize;
 
 				if ( !mult ) mult = 1;
 				if ( !div ) div = 1;
 
 				return  availBlks * mult / div;
 		}
 		return -1;
 }
 
 //   short  f_fstyp;    /* File system type */
 //   long  f_bsize;    /* Block size */
 //   long  f_frsize;   /* Fragment size */
 //   long  f_blocks;   /* Total number of blocks*/
 //   long  f_bfree;    /* Count of free blocks */
 //   long  f_files;    /* Total number of file nodes */
 //   long  f_ffree;    /* Count of free file nodes */
 //   char  f_fname[6]; /* Volumename */
 //   char  f_fpack[6]; /* Pack name */
 
 void QtRec::receive( const QCString &msg, const QByteArray & ) {
 		odebug << "Voicerecord received message "+msg << oendl;
 
 }
 
 
 ///////////////////////////// timerEvent
 void QtRec::timerEvent( QTimerEvent * ) {
 
 //    if(!recording)
 //       timeSlider->setValue( secCount);
 //     else
 //        timeSlider->setValue( filePara.numberOfRecordedSeconds);
 
 		if( stopped && playing) {
 				stop();
 		}
 
 		if( stopped && recording ){
 				stop();
 		}
 
 		if( recording && filePara.SecondsToRecord < secCount && filePara.SecondsToRecord != 0) {
 				stop();
 		}
 
 		odebug << "" << secCount << "" << oendl;
 		QString  timeString;
 
 		timeString.sprintf("%d", secCount);
 //		timeLabel->setText( timeString + " seconds");
 
 		secCount++;
 }
 
 void QtRec::changeTimeSlider(int index) {
 		if( ListView1->currentItem() == 0 || !wavFile->track.isOpen()) return;
-  odebug << "Slider moved to " << index << "" << oendl;
+		odebug << "Slider moved to " << index << "" << oendl;
 		paused = true;
 		stopped = true;
 
 		sliderPos=index;
 
 		QString timeString;
 		filePara.numberOfRecordedSeconds = (float)sliderPos / (float)filePara.sampleRate * (float)2;
 		timeString.sprintf( "%.2f", filePara.numberOfRecordedSeconds);
 		secCount = (int)filePara.numberOfRecordedSeconds;
 //		timeLabel->setText( timeString + tr(" seconds"));
 }
 
 void QtRec::timeSliderPressed() {
 		if( ListView1->currentItem() == 0) return;
-  odebug << "slider pressed" << oendl;
+		odebug << "slider pressed" << oendl;
 		paused = true;
 		stopped = true;
 }
 
 void QtRec::timeSliderReleased() {
 		if( ListView1->currentItem() == 0) return;
 		sliderPos = timeSlider->value();
 
- odebug << "slider released " << sliderPos << "" << oendl;
+		odebug << "slider released " << sliderPos << "" << oendl;
 		stopped = false;
 		int newPos =  lseek( filePara.fd, sliderPos, SEEK_SET);
 		total =  newPos*4;
 		filePara.numberOfRecordedSeconds = (float)sliderPos / (float)filePara.sampleRate * (float)2;
 
 		doPlay();
 }
 
 void QtRec::rewindPressed() {
 		if( ListView1->currentItem() == 0) return;
 		if( !wavFile->track.isOpen()) {
 				if( !openPlayFile() )
 						return;
 				else
 						if( !setupAudio( false))
 								return;
 		} else {
 				killTimers();
 				paused = true;
 				stopped = true;
 				rewindTimer->start( 50, false);
 		}
 }
 
 void QtRec::rewindTimerTimeout() {
 		int  sliderValue = timeSlider->value();
 		sliderValue = sliderValue - ( filePara.numberSamples / 100);
 			//  if(toBeginningButton->isDown())
 		timeSlider->setValue( sliderValue ) ;
-  odebug << "" << sliderValue << "" << oendl;
+		odebug << "" << sliderValue << "" << oendl;
 		QString timeString;
 		filePara.numberOfRecordedSeconds = (float)sliderValue / (float)filePara.sampleRate * (float)2;
 		timeString.sprintf( "%.2f", filePara.numberOfRecordedSeconds);
 //		timeLabel->setText( timeString+ tr(" seconds"));
 }
 
 void QtRec::rewindReleased() {
 		rewindTimer->stop();
 		if( wavFile->track.isOpen()) {
 				sliderPos=timeSlider->value();
 				stopped = false;
 				int newPos =  lseek( filePara.fd, sliderPos, SEEK_SET);
 				total =  newPos * 4;
-   odebug << "rewind released " << total << "" << oendl;
+				odebug << "rewind released " << total << "" << oendl;
 				startTimer( 1000);
 				doPlay();
 		}
 }
 
 void QtRec::FastforwardPressed() {
 		if( ListView1->currentItem() == 0) return;
 		if( !wavFile->track.isOpen())
 				if( !openPlayFile() )
 						return;
 				else
 						if( !setupAudio( false))
 								return;
 		killTimers();
 
 		paused = true;
 		stopped = true;
 		forwardTimer->start(50, false);
 }
 
 
 void QtRec::forwardTimerTimeout() {
 		int sliderValue = timeSlider->value();
 		sliderValue = sliderValue + ( filePara.numberSamples / 100);
 
 			//  if(toEndButton->isDown())
 		timeSlider->setValue( sliderValue);
 
 		QString timeString;
 		filePara.numberOfRecordedSeconds = (float)sliderValue / (float)filePara.sampleRate * (float)2;
 		timeString.sprintf( "%.2f", filePara.numberOfRecordedSeconds);
 //		timeLabel->setText( timeString+ tr(" seconds"));
 }
 
 void QtRec::FastforwardReleased() {
 		forwardTimer->stop();
 		if( wavFile->track.isOpen()) {
 				sliderPos=timeSlider->value();
 				stopped = false;
 				int newPos =  lseek( filePara.fd, sliderPos, SEEK_SET);
 				total =  newPos * 4;
 				filePara.numberOfRecordedSeconds = (float)sliderPos / (float)filePara.sampleRate * (float)2;
 				startTimer( 1000);
 				doPlay();
 		}
 }
 
 
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
@@ -1,290 +1,290 @@
 //wavFile.cpp
 #include "wavFile.h"
 #include "qtrec.h"
 
 /* OPIE */
 #include <opie2/odebug.h>
 #include <qpe/config.h>
 using namespace Opie::Core;
 
 /* QT */
 #include <qmessagebox.h>
 #include <qdir.h>
 
 /* STD */
 #include <errno.h>
 #include <sys/time.h>
 #include <sys/types.h>
 #include <sys/vfs.h>
 #include <fcntl.h>
 #include <math.h>
 #include <mntent.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 
 WavFile::WavFile( QObject * parent,const QString &fileName, bool makeNwFile, int sampleRate,
                   int channels, int resolution, int format )
         : QObject( parent)
 {
-//odebug << "new wave file" << oendl;
+		owarn << "new wave file: " << fileName << oendl;
     bool b =  makeNwFile;
     wavSampleRate=sampleRate;
     wavFormat=format;
     wavChannels=channels;
     wavResolution=resolution;
     useTmpFile=false;
     if( b) {
         newFile();
     } else {
         openFile(fileName);
     }
 }
 
 bool WavFile::newFile() {
 
 //  odebug << "Set up new file" << oendl;
   Config cfg("OpieRec");
   cfg.setGroup("Settings");
 
   currentFileName=cfg.readEntry("directory",QDir::homeDirPath());
   QString date;
   QDateTime dt = QDateTime::currentDateTime();
   date = dt.toString();//TimeString::dateString( QDateTime::currentDateTime(),false,true);
   date.replace(QRegExp("'"),"");
   date.replace(QRegExp(" "),"_");
   date.replace(QRegExp(":"),"-");
   date.replace(QRegExp(","),"");
 
   QString currentFile=date;
   if(currentFileName.right(1).find("/",0,true) == -1)
     currentFileName += "/" + date;
   else
     currentFileName += date;
   currentFileName+=".wav";
 
 //  odebug << "set up file for recording: "+currentFileName << oendl;
   char pointer[] = "/tmp/opierec-XXXXXX";
   int fd = 0;
 
   if( currentFileName.find("/mnt",0,true) == -1
       && currentFileName.find("/tmp",0,true) == -1 ) {
     // if destination file is most likely in flash (assuming jffs2)
     // we have to write to a different filesystem first
 
     useTmpFile = true;
     if(( fd = mkstemp( pointer)) < 0 ) {
        perror("mkstemp failed");
        return false;
     }
 
 //    odebug << "Opening tmp file " << pointer << "" << oendl;
     track.setName( pointer);
 
   } else { //just use regular file.. no moving
 
     useTmpFile = false;
     track.setName( currentFileName);
   }
   if(!track.open( IO_ReadWrite | IO_Truncate)) {
     QString errorMsg=(QString)strerror(errno);
     odebug << errorMsg << oendl;
     QMessageBox::message("Note", "Error opening file.\n" +errorMsg);
 
     return false;
   } else {
     setWavHeader( track.handle() , &hdr);
   }
 return true;
 }
 
 WavFile::~WavFile() {
 
     closeFile();
 }
 
 void WavFile::closeFile() {
     if(track.isOpen())
         track.close();
 }
 
 int WavFile::openFile(const QString &currentFileName) {
-//    odebug << "open play file "+currentFileName << oendl;
+		qWarning("open play file "+currentFileName);;
     closeFile();
 
-  track.setName(currentFileName);
-
-  if(!track.open(IO_ReadOnly)) {
-    QString errorMsg=(QString)strerror(errno);
-    odebug << "<<<<<<<<<<< "+errorMsg+currentFileName << oendl;
-    QMessageBox::message("Note", "Error opening file.\n" +errorMsg);
-    return -1;
-  } else {
-    parseWavHeader( track.handle());
-  }
-  return track.handle();
+		track.setName(currentFileName);
+
+		if(!track.open(IO_ReadOnly)) {
+				QString errorMsg=(QString)strerror(errno);
+				odebug << "<<<<<<<<<<< "+errorMsg+currentFileName << oendl;
+				QMessageBox::message("Note", "Error opening file.\n" +errorMsg);
+				return -1;
+		} else {
+				parseWavHeader( track.handle());
+		}
+		return track.handle();
 }
 
 bool WavFile::setWavHeader(int fd, wavhdr *hdr) {
 
   strncpy((*hdr).riffID, "RIFF", 4); // RIFF
   strncpy((*hdr).wavID, "WAVE", 4); //WAVE
   strncpy((*hdr).fmtID, "fmt ", 4); // fmt
   (*hdr).fmtLen = 16; // format length = 16
 
   if( wavFormat == WAVE_FORMAT_PCM) {
     (*hdr).fmtTag = 1; // PCM
 //    odebug << "set header  WAVE_FORMAT_PCM" << oendl;
   }
   else {
     (*hdr).fmtTag = WAVE_FORMAT_DVI_ADPCM; //intel ADPCM
  //    odebug << "set header  WAVE_FORMAT_DVI_ADPCM" << oendl;
   }
 
   //  (*hdr).nChannels = 1;//filePara.channels;// ? 2 : 1*/; // channels
   (*hdr).nChannels = wavChannels;// ? 2 : 1*/; // channels
 
   (*hdr).sampleRate = wavSampleRate; //samples per second
   (*hdr).avgBytesPerSec = (wavSampleRate)*( wavChannels*(wavResolution/8)); // bytes per second
   (*hdr).nBlockAlign = wavChannels*( wavResolution/8); //block align
   (*hdr).bitsPerSample = wavResolution; //bits per sample 8, or 16
 
   strncpy((*hdr).dataID, "data", 4);
 
   write( fd,hdr, sizeof(*hdr));
-   odebug << "writing header: bitrate " << wavResolution << ", samplerate " << wavSampleRate << ",  channels " << wavChannels << oendl;
+   owarn << "writing header: bitrate " << wavResolution << ", samplerate " << wavSampleRate << ",  channels " << wavChannels << oendl;
   return true;
 }
 
 bool WavFile::adjustHeaders(int fd, int total) {
   lseek(fd, 4, SEEK_SET);
   int i = total + 36;
   write( fd, &i, sizeof(i));
   lseek( fd, 40, SEEK_SET);
   write( fd, &total, sizeof(total));
-  odebug << "adjusting header " << total << "" << oendl;
+  owarn << "adjusting header " << total << "" << oendl;
   return true;
 }
 
 int WavFile::parseWavHeader(int fd) {
-  odebug << "Parsing wav header" << oendl;
+  owarn << "Parsing wav header" << oendl;
   char string[4];
   int found;
   short fmt;
   unsigned short ch, bitrate;
   unsigned long samplerrate, longdata;
 
   if (read(fd, string, 4) < 4) {
-    odebug << " Could not read from sound file." << oendl;
+    owarn << " Could not read from sound file." << oendl;
     return -1;
   }
   if (strncmp(string, "RIFF", 4)) {
-    odebug << " not a valid WAV file." << oendl;
+    owarn << " not a valid WAV file." << oendl;
     return -1;
   }
   lseek(fd, 4, SEEK_CUR);
   if (read(fd, string, 4) < 4) {
-    odebug << "Could not read from sound file." << oendl;
+    owarn << "Could not read from sound file." << oendl;
     return -1;
   }
   if (strncmp(string, "WAVE", 4)) {
-    odebug << "not a valid WAV file." << oendl;
+    owarn << "not a valid WAV file." << oendl;
     return -1;
   }
   found = 0;
 
   while (!found) {
     if (read(fd, string, 4) < 4) {
-      odebug << "Could not read from sound file." << oendl;
+      owarn << "Could not read from sound file." << oendl;
       return -1;
     }
     if (strncmp(string, "fmt ", 4)) {
       if (read(fd, &longdata, 4) < 4) {
-        odebug << "Could not read from sound file." << oendl;
+        owarn << "Could not read from sound file." << oendl;
         return -1;
       }
       lseek(fd, longdata, SEEK_CUR);
     } else {
       lseek(fd, 4, SEEK_CUR);
       if (read(fd, &fmt, 2) < 2) {
-        odebug << "Could not read format chunk." << oendl;
+        owarn << "Could not read format chunk." << oendl;
         return -1;
       }
       if (fmt != WAVE_FORMAT_PCM && fmt != WAVE_FORMAT_DVI_ADPCM) {
-        odebug << "Wave file contains unknown format. Unable to continue." << oendl;
+        owarn << "Wave file contains unknown format. Unable to continue." << oendl;
         return -1;
       }
       wavFormat = fmt;
       //      compressionFormat=fmt;
-      odebug << "compressionFormat is " << fmt << "" << oendl;
+      owarn << "compressionFormat is " << fmt << "" << oendl;
       if (read(fd, &ch, 2) < 2) {
-        odebug << "Could not read format chunk." << oendl;
+        owarn << "Could not read format chunk." << oendl;
         return -1;
       } else {
         wavChannels = ch;
-        odebug << "File has " << ch << " channels" << oendl;
+        owarn << "File has " << ch << " channels" << oendl;
       }
       if (read(fd, &samplerrate, 4) < 4) {
-        odebug << "Could not read from format chunk." << oendl;
+        owarn << "Could not read from format chunk." << oendl;
         return -1;
       } else {
         wavSampleRate = samplerrate;
         //                sampleRate = samplerrate;
-        odebug << "File has samplerate of " << (int) samplerrate << "" << oendl;
+        owarn << "File has samplerate of " << (int) samplerrate << "" << oendl;
       }
       lseek(fd, 6, SEEK_CUR);
       if (read(fd, &bitrate, 2) < 2) {
-        odebug << "Could not read format chunk." << oendl;
+        owarn << "Could not read format chunk." << oendl;
         return -1;
       }  else {
         wavResolution=bitrate;
         //                 resolution =  bitrate;
-        odebug << "File has bitrate of " << bitrate << "" << oendl;
+        owarn << "File has bitrate of " << bitrate << "" << oendl;
       }
       found++;
     }
   }
   found = 0;
   while (!found) {
     if (read(fd, string, 4) < 4) {
       odebug << "Could not read from sound file." << oendl;
       return -1;
     }
 
     if (strncmp(string, "data", 4)) {
       if (read(fd, &longdata, 4)<4) {
         odebug << "Could not read from sound file." << oendl;
         return -1;
       }
 
       lseek(fd, longdata, SEEK_CUR);
     } else {
       if (read(fd, &longdata, 4) < 4) {
         odebug << "Could not read from sound file." << oendl;
         return -1;
       } else {
         wavNumberSamples =  longdata;
          odebug << "file hase length of " << (int)longdata << ""
                 << "lasting "
                 << (int)(( longdata / wavSampleRate) / wavChannels) / ( wavChannels*( wavResolution/8))
                 << " seconds" << oendl;
 //        wavSeconds = (( longdata / wavSampleRate) / wavChannels) / ( wavChannels*( wavResolution/8));
 
   return longdata;
       }
     }
   }
 
   lseek(fd, 0, SEEK_SET);
 
   return 0;
 }
 
 QString WavFile::trackName() {
     return track.name();
 }
 
 int WavFile::wavHandle(){
   return track.handle();
 }