make device user configurable

3 files changed, 1469 insertions, 1495 deletions

diff --git a/noncore/multimedia/opierec/opierec.pro b/noncore/multimedia/opierec/opierec.pro
index 39fe493..5651151 100644
--- a/noncore/multimedia/opierec/opierec.pro
+++ b/noncore/multimedia/opierec/opierec.pro
@@ -1,3 +1,3 @@
-#CONFIG   = qt qtopia warn_on release pdaudio
-CONFIG   = qt warn_on release opie
+CONFIG   = qt qtopia warn_on release pdaudio
+#CONFIG   = qt warn_on release opie
 #CONFIG    = qt warn_on release quick-app
@@ -24,3 +24,4 @@ contains(CONFIG, pdaudio) {
   DEPENDPATH  += $(QPEDIR)/include
-  DEFINES += PDAUDIO
+  DEFINES += PDAUDIO 
+  DEFINES += THREADED
   TARGET    = qperec
diff --git a/noncore/multimedia/opierec/qtrec.cpp b/noncore/multimedia/opierec/qtrec.cpp
index bc6abcc..0a6e5ae 100644
--- a/noncore/multimedia/opierec/qtrec.cpp
+++ b/noncore/multimedia/opierec/qtrec.cpp
@@ -1,3 +1,3 @@
 /****************************************************************************
- // qtrec.cpp
+	 // qtrec.cpp
  Created: Thu Jan 17 11:19:58 2002
@@ -5,3 +5,2 @@
 ****************************************************************************/
-
 #define DEV_VERSION
@@ -90,17 +89,17 @@ struct adpcm_state decoder_state;
 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
+		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;
@@ -118,21 +117,23 @@ Device *soundDevice;
 
-// threaded recording
-//fuckin fulgy here
-//void quickRec()
-//{
-void QtRec::quickRec() {
-
-   qDebug("%d",
-          filePara.numberSamples/filePara.sampleRate * filePara.channels);
-   qDebug("samples %d, rate %d, channels %d",
-          filePara.numberSamples, filePara.sampleRate, filePara.channels);
-
-   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;
+
+#ifdef THREADED
+void quickRec()
+#else
+		void QtRec::quickRec() 
+#endif
+{
+		
+		qDebug("%d",
+					 filePara.numberSamples/filePara.sampleRate * filePara.channels);
+		qDebug("samples %d, rate %d, channels %d",
+					 filePara.numberSamples, filePara.sampleRate, filePara.channels);
+
+		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;
@@ -140,3 +141,3 @@ void QtRec::quickRec() {
 
-   if( filePara.resolution == 16 ) { //AFMT_S16_LE)
+		if( filePara.resolution == 16 ) { //AFMT_S16_LE)
 //       qDebug("AFMT_S16_LE size %d", filePara.SecondsToRecord);
@@ -144,89 +145,89 @@ void QtRec::quickRec() {
 //       qDebug("%d", filePara.sd);
-      level = 7;
-      threshold = 0;
+				level = 7;
+				threshold = 0;
 
-      if( filePara.format == WAVE_FORMAT_DVI_ADPCM) {
+				if( filePara.format == WAVE_FORMAT_DVI_ADPCM) {
 //          qDebug("start recording WAVE_FORMAT_DVI_ADPCM");
-         // <<<<<<<<<<<<<<<<<<<<<<<<<<<  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) {
-               qDebug("quickRec:: stopped");
-               break;
-            }
+							// <<<<<<<<<<<<<<<<<<<<<<<<<<<  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) {
+//										qDebug("quickRec:: stopped");
+										break;
+								}
 
 //             number=::read( filePara.sd, sbuf, BUFSIZE);
-            number =  soundDevice ->devRead( filePara.sd, sbuf, BUFSIZE);
-
-            if(number <= 0) {
-               perror("recording error ");
-               qDebug( "%s %d", filePara.fileName, number);
-               stopped = true;
-               return;
-            }
-            //if(stereo == 2) {
+								number =  soundDevice ->devRead( filePara.sd, sbuf, BUFSIZE);
+
+								if(number <= 0) {
+										perror("recording error ");
+										qDebug( "%s %d", filePara.fileName, number);
+										stopped = true;
+										return;
+								}
+									//if(stereo == 2) {
 //        adpcm_coder( sbuf2, abuf, number/2, &encoder_state);
-            adpcm_coder( sbuf, 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 , (short *)abuf, number/4);
 
-						waveform->newSamples( (const short *)abuf, bytesWritten );
+								waveform->newSamples( (const short *)abuf, bytesWritten );
 
-            total += bytesWritten;
-            filePara.numberSamples = total;
-            timeSlider->setValue( total);
+								total += bytesWritten;
+								filePara.numberSamples = total;
+								timeSlider->setValue( total);
 
-            filePara.numberOfRecordedSeconds = (float)total / (float)filePara.sampleRate * (float)2 / filePara.channels;
-
-            qApp->processEvents();
-            if( total >= filePara.samplesToRecord) {
-               stopped = true;
-               break;
-            }
-         }
-      } else {
-         // <<<<<<<<<<<<<<<<<<<<<<<<<<<  WAVE_FORMAT_PCM   >>>>>>>>>>>>>>>>>>>>>>
-         qDebug("start recording WAVE_FORMAT_PCM");
-         short inbuffer[ BUFSIZE ], outbuffer[ BUFSIZE ];
-         memset( inbuffer, 0, BUFSIZE);
-         memset( outbuffer, 0, BUFSIZE);
-
-         for(;;) {
-            if ( stopped) {
-               qDebug("quickRec:: stopped");
-               stopped = true;
-               break;  // stop if playing was set to false
-               return;
-            }
-
-            number = soundDevice->devRead( filePara.sd, (short *)inbuffer, BUFSIZE);
-            waveform->newSamples( inbuffer, number );
-
-            if( number <= 0) {
-               perror( "recording error ");
-               qDebug( filePara.fileName);
-               stopped = true;
-               return;
-            }
-
-            bytesWritten = ::write( filePara.fd , inbuffer, number);
-
-            if( bytesWritten < 0) {
-               perror("File writing error ");
-               stopped = true;
-               return;
-            }
-
-            total += bytesWritten;
-
-            filePara.numberSamples = total;
-
-            if( filePara.SecondsToRecord != 0)
-               timeSlider->setValue( total);
+								filePara.numberOfRecordedSeconds = (float)total / (float)filePara.sampleRate * (float)2 / filePara.channels;
+
+								qApp->processEvents();
+								if( total >= filePara.samplesToRecord) {
+										stopped = true;
+										break;
+								}
+						}
+				} else {
+							// <<<<<<<<<<<<<<<<<<<<<<<<<<<  WAVE_FORMAT_PCM   >>>>>>>>>>>>>>>>>>>>>>
+						qDebug("start recording WAVE_FORMAT_PCM");
+						short inbuffer[ BUFSIZE ], outbuffer[ BUFSIZE ];
+						memset( inbuffer, 0, BUFSIZE);
+						memset( outbuffer, 0, BUFSIZE);
+
+						for(;;) {
+								if ( stopped) {
+										qDebug("quickRec:: stopped");
+										stopped = true;
+										break;  // stop if playing was set to false
+										return;
+								}
+
+								number = soundDevice->devRead( filePara.sd, (short *)inbuffer, BUFSIZE);
+								waveform->newSamples( inbuffer, number );
+
+								if( number <= 0) {
+										perror( "recording error ");
+										qDebug( filePara.fileName);
+										stopped = true;
+										return;
+								}
+
+								bytesWritten = ::write( filePara.fd , 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("Writing number %d, bytes %d,total %d\r",number,  bytesWritten , total);
@@ -234,75 +235,79 @@ void QtRec::quickRec() {
 
-            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) {
-            qDebug("quickRec:: stopped");
-            break;  // stop if playing was set to false
-         }
+								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) {
+								qDebug("quickRec:: stopped");
+								break;  // stop if playing was set to false
+						}
          
-         number = ::read( filePara.sd, unsigned_inbuffer, BUFSIZE);
-         bytesWritten = ::write( filePara.fd , unsigned_inbuffer, number);
-
-         if(bytesWritten < 0) {
-            stopped = true;
-            QMessageBox::message("Note","There was a problem\nwriting to the file");
-            perror("File writing error ");
-            return;
-         }
-
-         total += bytesWritten;
-         filePara.numberSamples = total;
-         //             printf("\nWriting number %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
-   }
+						number = ::read( filePara.sd, unsigned_inbuffer, BUFSIZE);
+						bytesWritten = ::write( filePara.fd , unsigned_inbuffer, number);
+
+						if(bytesWritten < 0) {
+								stopped = true;
+								QMessageBox::message("Note","There was a problem\nwriting to the file");
+								perror("File writing error ");
+								return;
+						}
+
+						total += bytesWritten;
+						filePara.numberSamples = total;
+							//             printf("\nWriting number %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
+		}
 } /// END quickRec()
 
-void QtRec::playIt()
 
-//void playIt()
+#ifdef THREADED
+void playIt()
+#else
+		void QtRec::playIt()
+#endif
 {
-   int bytesWritten, number;
-   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);
+		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
+						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);
+								number = ::read( filePara.fd, abuf, BUFSIZE / 2);
+								adpcm_decoder( abuf, sbuf, number * 2, &decoder_state);
 
@@ -311,12 +316,12 @@ void QtRec::playIt()
 //                 }
-            bytesWritten = write ( filePara.sd, sbuf, number * 4);
-            waveform->newSamples( (const short *)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);
+								bytesWritten = write ( filePara.sd, sbuf, number * 4);
+								waveform->newSamples( (const short *)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);
@@ -324,26 +329,26 @@ void QtRec::playIt()
 //            timeLabel->setText( timeString+ tr(" seconds"));
-         printf("playing number %d, bytes %d, total %d\n",number,  bytesWritten, total/4);
-         fflush(stdout);
+// 								printf("playing number %d, bytes %d, total %d\n",number,  bytesWritten, total/4);
+// 								fflush(stdout);
 
-            qApp->processEvents();
+								qApp->processEvents();
 
-            if( /*total >= filePara.numberSamples || */ bytesWritten == 0) {
+								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;
-            }
+										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);
+								number = ::read( filePara.fd, inbuffer, BUFSIZE);
 //                 for (int i=0;i< number * 2; 2 * i++) { //2*i is left channel
@@ -352,14 +357,14 @@ void QtRec::playIt()
 //                 }
-            bytesWritten = ::write( filePara.sd, inbuffer, number);
-            waveform->newSamples( inbuffer, bytesWritten );
-            //-------------->>>> 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;
+								bytesWritten = ::write( filePara.sd, inbuffer, number);
+								waveform->newSamples( inbuffer, bytesWritten );
+									//-------------->>>> 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;
 
@@ -368,64 +373,70 @@ void QtRec::playIt()
 
-            qApp->processEvents();
+								qApp->processEvents();
 
-            if( /*total >= filePara.numberSamples || */ bytesWritten == 0) {
-               qWarning("Jane! Stop this crazy thing!");
-               stopped = true;
+								if( /*total >= filePara.numberSamples || */ bytesWritten == 0) {
+										qWarning("Jane! Stop this crazy thing!");
+										stopped = true;
 //                playing = false;
-               break;
-            }
-         }
+										break;
+								}
+						}
             printf("\nplaying number %d, bytes %d, total %d\r",number,  bytesWritten, total);
             fflush(stdout);
-      } //end loop
-   } else {
+				} //end loop
+		} else {
 /////////////////////////////// format = AFMT_U8;
-      unsigned char unsigned_inbuffer[ BUFSIZE ]; //, unsigned_outbuffer[BUFSIZE];
-      memset( unsigned_inbuffer, 0, BUFSIZE);
-      for(;;) {
+				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);
+						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;
+							//          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.numberSamples = total;
 
-         filePara.numberOfRecordedSeconds = (float)total / (float)filePara.sampleRate;
+						filePara.numberOfRecordedSeconds = (float)total / (float)filePara.sampleRate;
 //          timeString.sprintf("%.2f",filePara.numberOfRecordedSeconds);
 //          timeLabel->setText( timeString + tr(" seconds"));
-         qApp->processEvents();
+						qApp->processEvents();
 
-         if( /*total >= filePara.numberSamples || */ bytesWritten == 0) {
+						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);
-      }
-   }
+								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 )
+				: QWidget( parent, name, fl )
 {
-   if ( !name )
-      setName( "OpieRec" );
-   init();
-   initConfig();
-   initConnections();
-   renameBox = 0;
+		if ( !name )
+				setName( "OpieRec" );
+		init();
+		initConfig();
+		initConnections();
+		renameBox = 0;
 
 // open sound device to get volumes
-   soundDevice = new Device( this, DSPSTROUT, DSPSTRMIXEROUT, false);
+		Config hwcfg("OpieRec");
+		hwcfg.setGroup("Hardware");
+
+		
+		soundDevice = new Device( this,
+															hwcfg.readEntry( "Audio",DSPSTROUT),
+															hwcfg.readEntry( "Mixer",DSPSTRMIXEROUT), false);
+//		soundDevice = new Device( this, hwcfg.readEntry( "Audio","hw:0"), hwcfg.readEntry( "Mixer","hw:0"), false);
 
@@ -435,18 +446,18 @@ QtRec::QtRec( QWidget* parent,  const char* name, WFlags fl )
 
-   getInVol();
-   getOutVol();
+		getInVol();
+		getOutVol();
 
-   soundDevice->closeDevice( true);
-   soundDevice->sd = -1;
-   soundDevice = 0;
-   wavFile = 0;
+		soundDevice->closeDevice( true);
+		soundDevice->sd = -1;
+		soundDevice = 0;
+		wavFile = 0;
 
-   if( soundDevice) delete soundDevice;
+		if( soundDevice) delete soundDevice;
 
-   initIconView();
+		initIconView();
 
-   if( autoMute)
-      doMute( true);
-   ListView1->setFocus();
-   playing = false;
+		if( autoMute)
+				doMute( true);
+		ListView1->setFocus();
+		playing = false;
 }
@@ -459,13 +470,13 @@ void QtRec::cleanUp() {
 
-   if( !stopped) {
-      stopped = true;
-      endRecording();
-   }
+		if( !stopped) {
+				stopped = true;
+				endRecording();
+		}
 
-   ListView1->clear();
+		ListView1->clear();
 
-   if( autoMute)
-      doMute(false);
+		if( autoMute)
+				doMute(false);
 
-   if( wavFile) delete wavFile;
+		if( wavFile) delete wavFile;
 // if(soundDevice) delete soundDevice;
@@ -475,110 +486,110 @@ void QtRec::init() {
 
-   needsStereoOut = false;
-   QPixmap image3( ( const char** ) image3_data );
-   QPixmap image4( ( const char** ) image4_data );
-   QPixmap image6( ( const char** ) image6_data );
+		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 " ) + QString::number(VERSION) );
-   QGridLayout *layout = new QGridLayout( this );
-   layout->setSpacing( 2);
-   layout->setMargin( 2);
+		stopped = true;
+		setCaption( tr( "OpieRecord " ) + QString::number(VERSION) );
+		QGridLayout *layout = new QGridLayout( this );
+		layout->setSpacing( 2);
+		layout->setMargin( 2);
 
-   TabWidget = new QTabWidget( this, "TabWidget" );
-   layout->addMultiCellWidget(TabWidget, 0, 7, 0, 7);
+		TabWidget = new QTabWidget( this, "TabWidget" );
+		layout->addMultiCellWidget(TabWidget, 0, 7, 0, 7);
 //    TabWidget->setTabShape(QTabWidget::Triangular);
 
-   ///**********<<<<<<<<<<<<>>>>>>>>>>>>***************
-   tab = new QWidget( TabWidget, "tab" );
-
-   QGridLayout *layout1 = new QGridLayout( tab);
-   layout1->setSpacing( 2);
-   layout1->setMargin( 2);
-
-   timeSlider = new QSlider( 0,100,10,0, QSlider::Horizontal, tab, (const char *) "timeSlider" );
-   layout1->addMultiCellWidget( timeSlider, 1, 1, 0, 3);
-
-   timeLabel = new QLabel( tab, "TimeLabel" );
-   layout1->addMultiCellWidget( timeLabel, 0, 0, 0, 3);
-
-   playLabel2 = new QLabel(tab, "PlayLabel2" );
-   playLabel2->setText(tr("Play") );
-   playLabel2->setFixedHeight( 18);
-   layout1->addMultiCellWidget( playLabel2, 0, 0, 4, 4);
-
-   Stop_PushButton = new QPushButton(  tab, "Stop_PushButton" );
-   layout1->addMultiCellWidget( Stop_PushButton, 1, 1, 4, 4);
-   Stop_PushButton->setFixedSize( 22, 22);
-   Stop_PushButton->setPixmap( image4 );
-
-   toBeginningButton = new QPushButton(  tab, "Beginning_PushButton" );
-   layout1->addMultiCellWidget(toBeginningButton, 1, 1, 5, 5);
-   toBeginningButton->setFixedSize( 22, 22);
-   toBeginningButton->setPixmap( Resource::loadPixmap("fastback") );
-
-   toEndButton = new QPushButton(  tab, "End_PushButton" );
-   layout1->addMultiCellWidget( toEndButton, 1, 1, 6, 6);
-   toEndButton->setFixedSize( 22, 22);
-   toEndButton->setPixmap(  Resource::loadPixmap( "fastforward" )  );
-
-   QLabel *recLabel2;
-   recLabel2 = new QLabel( tab, "recLabel2" );
-   recLabel2->setText(tr("Rec"));
-   recLabel2->setFixedHeight( 18);
-   layout1->addMultiCellWidget( recLabel2, 0, 0, 7, 7);
-
-   Rec_PushButton = new QPushButton( tab, "Rec_PushButton" );
-   layout1->addMultiCellWidget(  Rec_PushButton, 1, 1, 7, 7);
-   Rec_PushButton->setFixedSize( 22, 22);
-   Rec_PushButton->setPixmap( image6 );
-
-   t = new QTimer( this );
-   connect( t, SIGNAL( timeout() ), SLOT( timerBreak() ) );
-
-   rewindTimer = new QTimer( this );
-   connect( rewindTimer, SIGNAL( timeout() ),
-            this, SLOT( rewindTimerTimeout() ) );
-
-   forwardTimer = new QTimer( this );
-   connect( forwardTimer, SIGNAL( timeout() ),
-            this, SLOT( forwardTimerTimeout() ) );
-
-   deleteSoundButton  = new QPushButton( tab, "deleteSoundButton" );
-   layout1->addMultiCellWidget( deleteSoundButton, 1, 1, 8, 8);
-   deleteSoundButton->setText( tr( "Delete" ) );
-
-   ListView1 = new QListView( tab, "IconView1" );
-   layout1->addMultiCellWidget( ListView1, 2, 2, 0, 8);
-
-   ListView1->addColumn( tr( "Name" ) );
-   ListView1->setColumnWidth( 0, 140);
-   ListView1->setSorting( 1, false);
-   ListView1->addColumn( tr( "Time" ) ); //in seconds
-   ListView1->setColumnWidth( 1, 50);
-   ListView1->addColumn( tr("Location") );
-   ListView1->setColumnWidth( 2, 50);
-   ListView1->addColumn( tr("Date") );
-   ListView1->setColumnWidth( 3, 63);
-
-   ListView1->setColumnWidthMode( 0, QListView::Manual);
-   ListView1->setColumnAlignment( 1, QListView::AlignCenter);
-   ListView1->setColumnAlignment( 2, QListView::AlignRight);
-   ListView1->setColumnAlignment( 3, QListView::AlignLeft);
-   ListView1->setAllColumnsShowFocus( true );
-   QPEApplication::setStylusOperation( ListView1->viewport(), QPEApplication::RightOnHold);
-
-   TabWidget->insertTab( tab, tr( "Files" ) );
-
-   ///**********<<<<<<<<<<<<>>>>>>>>>>>>***************
-   tab_3 = new QWidget( TabWidget, "tab_3" );
-   QGridLayout *glayout3 = new QGridLayout( tab_3 );
-   glayout3->setSpacing( 2);
-   glayout3->setMargin( 2);
-   ////////////////////////////////////
-   sampleGroup = new QGroupBox( tab_3, "samplegroup" );
-   sampleGroup->setTitle( tr( "Sample Rate" ) );
-   sampleGroup->setFixedSize( 95,50);
-
-   sampleRateComboBox = new QComboBox( false, sampleGroup, "SampleRateComboBox" );
-   sampleRateComboBox->setGeometry( QRect( 10, 20, 80, 25 ) );
+			///**********<<<<<<<<<<<<>>>>>>>>>>>>***************
+		tab = new QWidget( TabWidget, "tab" );
+
+		QGridLayout *layout1 = new QGridLayout( tab);
+		layout1->setSpacing( 2);
+		layout1->setMargin( 2);
+
+		timeSlider = new QSlider( 0,100,10,0, QSlider::Horizontal, tab, (const char *) "timeSlider" );
+		layout1->addMultiCellWidget( timeSlider, 1, 1, 0, 3);
+
+		timeLabel = new QLabel( tab, "TimeLabel" );
+		layout1->addMultiCellWidget( timeLabel, 0, 0, 0, 3);
+
+		playLabel2 = new QLabel(tab, "PlayLabel2" );
+		playLabel2->setText(tr("Play") );
+		playLabel2->setFixedHeight( 18);
+		layout1->addMultiCellWidget( playLabel2, 0, 0, 4, 4);
+
+		Stop_PushButton = new QPushButton(  tab, "Stop_PushButton" );
+		layout1->addMultiCellWidget( Stop_PushButton, 1, 1, 4, 4);
+		Stop_PushButton->setFixedSize( 22, 22);
+		Stop_PushButton->setPixmap( image4 );
+
+		toBeginningButton = new QPushButton(  tab, "Beginning_PushButton" );
+		layout1->addMultiCellWidget(toBeginningButton, 1, 1, 5, 5);
+		toBeginningButton->setFixedSize( 22, 22);
+		toBeginningButton->setPixmap( Resource::loadPixmap("fastback") );
+
+		toEndButton = new QPushButton(  tab, "End_PushButton" );
+		layout1->addMultiCellWidget( toEndButton, 1, 1, 6, 6);
+		toEndButton->setFixedSize( 22, 22);
+		toEndButton->setPixmap(  Resource::loadPixmap( "fastforward" )  );
+
+		QLabel *recLabel2;
+		recLabel2 = new QLabel( tab, "recLabel2" );
+		recLabel2->setText(tr("Rec"));
+		recLabel2->setFixedHeight( 18);
+		layout1->addMultiCellWidget( recLabel2, 0, 0, 7, 7);
+
+		Rec_PushButton = new QPushButton( tab, "Rec_PushButton" );
+		layout1->addMultiCellWidget(  Rec_PushButton, 1, 1, 7, 7);
+		Rec_PushButton->setFixedSize( 22, 22);
+		Rec_PushButton->setPixmap( image6 );
+
+		t = new QTimer( this );
+		connect( t, SIGNAL( timeout() ), SLOT( timerBreak() ) );
+
+		rewindTimer = new QTimer( this );
+		connect( rewindTimer, SIGNAL( timeout() ),
+						 this, SLOT( rewindTimerTimeout() ) );
+
+		forwardTimer = new QTimer( this );
+		connect( forwardTimer, SIGNAL( timeout() ),
+						 this, SLOT( forwardTimerTimeout() ) );
+
+		deleteSoundButton  = new QPushButton( tab, "deleteSoundButton" );
+		layout1->addMultiCellWidget( deleteSoundButton, 1, 1, 8, 8);
+		deleteSoundButton->setText( tr( "Delete" ) );
+
+		ListView1 = new QListView( tab, "IconView1" );
+		layout1->addMultiCellWidget( ListView1, 2, 2, 0, 8);
+
+		ListView1->addColumn( tr( "Name" ) );
+		ListView1->setColumnWidth( 0, 140);
+		ListView1->setSorting( 1, false);
+		ListView1->addColumn( tr( "Time" ) ); //in seconds
+		ListView1->setColumnWidth( 1, 50);
+		ListView1->addColumn( tr("Location") );
+		ListView1->setColumnWidth( 2, 50);
+		ListView1->addColumn( tr("Date") );
+		ListView1->setColumnWidth( 3, 63);
+
+		ListView1->setColumnWidthMode( 0, QListView::Manual);
+		ListView1->setColumnAlignment( 1, QListView::AlignCenter);
+		ListView1->setColumnAlignment( 2, QListView::AlignRight);
+		ListView1->setColumnAlignment( 3, QListView::AlignLeft);
+		ListView1->setAllColumnsShowFocus( true );
+		QPEApplication::setStylusOperation( ListView1->viewport(), QPEApplication::RightOnHold);
+
+		TabWidget->insertTab( tab, tr( "Files" ) );
+
+			///**********<<<<<<<<<<<<>>>>>>>>>>>>***************
+		tab_3 = new QWidget( TabWidget, "tab_3" );
+		QGridLayout *glayout3 = new QGridLayout( tab_3 );
+		glayout3->setSpacing( 2);
+		glayout3->setMargin( 2);
+			////////////////////////////////////
+		sampleGroup = new QGroupBox( tab_3, "samplegroup" );
+		sampleGroup->setTitle( tr( "Sample Rate" ) );
+		sampleGroup->setFixedSize( 95,50);
+
+		sampleRateComboBox = new QComboBox( false, sampleGroup, "SampleRateComboBox" );
+		sampleRateComboBox->setGeometry( QRect( 10, 20, 80, 25 ) );
 //#ifndef QT_QWS_EBX
@@ -592,35 +603,35 @@ void QtRec::init() {
 
-   glayout3->addMultiCellWidget(  sampleGroup, 0, 0, 0, 0);
+		glayout3->addMultiCellWidget(  sampleGroup, 0, 0, 0, 0);
 
-   sizeGroup= new QGroupBox( tab_3, "sizeGroup" );
-   sizeGroup->setTitle( tr( "Limit Size" ) );
-   sizeGroup->setFixedSize( 80, 50);
+		sizeGroup= new QGroupBox( tab_3, "sizeGroup" );
+		sizeGroup->setTitle( tr( "Limit Size" ) );
+		sizeGroup->setFixedSize( 80, 50);
 
-   sizeLimitCombo = new QComboBox( false, sizeGroup, "sizeLimitCombo" );
-   sizeLimitCombo ->setGeometry( QRect( 5, 20, 70, 25 ) );
-   sizeLimitCombo->insertItem(tr("Unlimited"));
+		sizeLimitCombo = new QComboBox( false, sizeGroup, "sizeLimitCombo" );
+		sizeLimitCombo ->setGeometry( QRect( 5, 20, 70, 25 ) );
+		sizeLimitCombo->insertItem(tr("Unlimited"));
 
-   for(int i=1;i<13; i++) {
-      sizeLimitCombo->insertItem( QString::number( i * 5));
-   }
+		for(int i=1;i<13; i++) {
+				sizeLimitCombo->insertItem( QString::number( i * 5));
+		}
 
 
-   glayout3->addMultiCellWidget(  sizeGroup, 0, 0, 1, 1);
-   dirGroup = new QGroupBox( tab_3, "dirGroup" );
-   dirGroup->setTitle( tr( "File Directory" ) );
-   dirGroup->setFixedSize( 130, 50);
+		glayout3->addMultiCellWidget(  sizeGroup, 0, 0, 1, 1);
+		dirGroup = new QGroupBox( tab_3, "dirGroup" );
+		dirGroup->setTitle( tr( "File Directory" ) );
+		dirGroup->setFixedSize( 130, 50);
 
-   directoryComboBox = new QComboBox( false, dirGroup, "dirGroup" );
-   directoryComboBox->setGeometry( QRect( 10, 15, 115, 25 ) );
+		directoryComboBox = new QComboBox( false, dirGroup, "dirGroup" );
+		directoryComboBox->setGeometry( QRect( 10, 15, 115, 25 ) );
 
-   glayout3->addMultiCellWidget(  dirGroup, 1, 1, 0, 0);
+		glayout3->addMultiCellWidget(  dirGroup, 1, 1, 0, 0);
 
-   bitGroup = new QGroupBox( tab_3, "bitGroup" );
-   bitGroup->setTitle( tr( "Bit Depth" ) );
-   bitGroup->setFixedSize( 65, 50);
+		bitGroup = new QGroupBox( tab_3, "bitGroup" );
+		bitGroup->setTitle( tr( "Bit Depth" ) );
+		bitGroup->setFixedSize( 65, 50);
 
-   bitRateComboBox = new QComboBox( false, bitGroup, "BitRateComboBox" );
+		bitRateComboBox = new QComboBox( false, bitGroup, "BitRateComboBox" );
 
 		z = 0;
-	 while( deviceBitRates[z] != -1) {
+		while( deviceBitRates[z] != -1) {
 				bitRateComboBox->insertItem( s.setNum( deviceBitRates[z], 10) );
@@ -631,122 +642,70 @@ void QtRec::init() {
 
-   glayout3->addMultiCellWidget(  bitGroup, 1, 1, 1, 1);
-
-   compressionCheckBox = new QCheckBox ( tr("Wave Compression (smaller files)"), tab_3 );
-
-   autoMuteCheckBox = new QCheckBox ( tr("Auto Mute"), tab_3 );
-   stereoCheckBox = new QCheckBox ( tr("Stereo Channels"), tab_3 );
-
-   glayout3->addMultiCellWidget( compressionCheckBox, 2, 2, 0, 3);
-   glayout3->addMultiCellWidget( autoMuteCheckBox, 3, 3, 0, 0);
-   glayout3->addMultiCellWidget( stereoCheckBox, 3, 3, 1, 1);
+		glayout3->addMultiCellWidget(  bitGroup, 1, 1, 1, 1);
 
-   QWidget *d = QApplication::desktop();
-   int width = d->width();
-   int height = d->height();
+		compressionCheckBox = new QCheckBox ( tr("Wave Compression (smaller files)"), tab_3 );
 
-   if( width < height) {
+		autoMuteCheckBox = new QCheckBox ( tr("Auto Mute"), tab_3 );
+		stereoCheckBox = new QCheckBox ( tr("Stereo Channels"), tab_3 );
 
-      tab_5 = new QWidget( TabWidget, "tab_5" );
+		glayout3->addMultiCellWidget( compressionCheckBox, 2, 2, 0, 3);
+		glayout3->addMultiCellWidget( autoMuteCheckBox, 3, 3, 0, 0);
+		glayout3->addMultiCellWidget( stereoCheckBox, 3, 3, 1, 1);
 
-      QHBoxLayout *Layout19a;
-      Layout19a = new QHBoxLayout( tab_5);
-      Layout19a->setSpacing( 2 );
-      Layout19a->setMargin( 0 );
+		tab_5 = new QWidget( TabWidget, "tab_5" );
 
-      Layout15 = new QVBoxLayout( this);
-      Layout15->setSpacing( 2 );
-      Layout15->setMargin( 0 );
+		QHBoxLayout *Layout19a;
+		Layout19a = new QHBoxLayout( tab_5);
+		Layout19a->setSpacing( 2 );
+		Layout19a->setMargin( 0 );
 
-      Layout15b = new QVBoxLayout( this);
-      Layout15b->setSpacing( 2 );
-      Layout15b->setMargin( 0 );
+		Layout15 = new QVBoxLayout( this);
+		Layout15->setSpacing( 2 );
+		Layout15->setMargin( 0 );
 
-      TextLabel2 = new QLabel( tab_5, "InputLabel" );
-      TextLabel2->setText( tr( "In"));
-      TextLabel2->setFixedWidth( 35);
-      Layout15->addWidget( TextLabel2 );
+		Layout15b = new QVBoxLayout( this);
+		Layout15b->setSpacing( 2 );
+		Layout15b->setMargin( 0 );
 
-      TextLabel3 = new QLabel( tab_5, "OutputLabel" );
-      TextLabel3->setText( tr( "Out" ) );
-      Layout15b->addWidget( TextLabel3 );
+		TextLabel2 = new QLabel( tab_5, "InputLabel" );
+		TextLabel2->setText( tr( "In"));
+		TextLabel2->setFixedWidth( 35);
+		Layout15->addWidget( TextLabel2 );
 
-      InputSlider = new QSlider( -100, 0, 10, 0, QSlider::Vertical, tab_5, (const char *) "InputSlider" );
-      InputSlider->setTickmarks( QSlider::Both);
-      Layout15->addWidget( InputSlider);
+		TextLabel3 = new QLabel( tab_5, "OutputLabel" );
+		TextLabel3->setText( tr( "Out" ) );
+		Layout15b->addWidget( TextLabel3 );
 
-      OutputSlider = new QSlider( -100,0,10,0, QSlider::Vertical,tab_5,(const char *) "OutputSlider" );
-      OutputSlider->setTickmarks( QSlider::Both);
+		InputSlider = new QSlider( -100, 0, 10, 0, QSlider::Vertical, tab_5, (const char *) "InputSlider" );
+		InputSlider->setTickmarks( QSlider::Both);
+		Layout15->addWidget( InputSlider);
 
-      Layout15b->addWidget( OutputSlider );
+		OutputSlider = new QSlider( -100,0,10,0, QSlider::Vertical,tab_5,(const char *) "OutputSlider" );
+		OutputSlider->setTickmarks( QSlider::Both);
 
-      outMuteCheckBox = new QCheckBox ( tr("mute"), tab_5 );
-      Layout15->addWidget( outMuteCheckBox );
+		Layout15b->addWidget( OutputSlider );
 
-      inMuteCheckBox = new QCheckBox ( tr("mute"), tab_5 );
-      inMuteCheckBox-> setFocusPolicy ( QWidget::NoFocus );
-      Layout15b->addWidget( inMuteCheckBox );
+		outMuteCheckBox = new QCheckBox ( tr("mute"), tab_5 );
+		Layout15->addWidget( outMuteCheckBox );
 
+		inMuteCheckBox = new QCheckBox ( tr("mute"), tab_5 );
+		inMuteCheckBox-> setFocusPolicy ( QWidget::NoFocus );
+		Layout15b->addWidget( inMuteCheckBox );
 
-      Layout19a->addLayout( Layout15 );
-      Layout19a->addLayout( Layout15b );
 
-      fillDirectoryCombo();
+		Layout19a->addLayout( Layout15 );
+		Layout19a->addLayout( Layout15b );
 
-      TabWidget->insertTab( tab_3, tr( "Options" ) );
+		fillDirectoryCombo();
 
-      TabWidget->insertTab( tab_5, tr( "Volume" ) );
+		TabWidget->insertTab( tab_3, tr( "Options" ) );
 
-   } else {// landscape
+		TabWidget->insertTab( tab_5, tr( "Volume" ) );
 
-      //  Layout16->addWidget( dirGroup );
-      //  Layout18->addLayout( Layout16 );
-      Layout15 = new QVBoxLayout(this);
-      Layout15->setSpacing( 2 );
-      Layout15->setMargin( 0 );
 
-      Layout15b = new QVBoxLayout(this);
-      Layout15b->setSpacing( 2 );
-      Layout15b->setMargin( 0 );
-
-      TextLabel2 = new QLabel( tab_3, "InputLabel" );
-      TextLabel2->setText( tr( "In"));
-      TextLabel2->setFixedWidth(35);
-      Layout15->addWidget( TextLabel2 );
-
-      TextLabel3 = new QLabel( tab_3, "OutputLabel" );
-      TextLabel3->setText( tr( "Out" ) );
-      Layout15b->addWidget( TextLabel3 );
-
-      InputSlider = new QSlider( -100, 0, 10, 0, QSlider::Vertical, tab_3, (const char *) "InputSlider" );
-      InputSlider->setTickmarks(QSlider::Both);
-      Layout15->addWidget( InputSlider);
-
-      OutputSlider = new QSlider( -100,0,10,0, QSlider::Vertical,tab_3,(const char *) "OutputSlider" );
-      OutputSlider->setTickmarks(QSlider::Both);
-
-      Layout15b->addWidget( OutputSlider );
-
-      outMuteCheckBox = new QCheckBox ( tr("mute"), tab_3 );
-      Layout15->addWidget( outMuteCheckBox );
-
-      inMuteCheckBox = new QCheckBox ( tr("mute"), tab_3 );
-      inMuteCheckBox-> setFocusPolicy ( QWidget::NoFocus );
-      Layout15b->addWidget( inMuteCheckBox );
-
-
-      Layout19->addLayout( Layout15 );
-      Layout19->addLayout( Layout15b );
-
-      fillDirectoryCombo();
-
-      TabWidget->insertTab( tab_3, tr( "Options" ) );
-
-   }
-
-   waveform = new Waveform( this, "waveform" );
+		waveform = new Waveform( this, "waveform" );
 //   waveform->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5, (QSizePolicy::SizeType)3, waveform->sizePolicy().hasHeightForWidth() ) );
-   waveform->setMinimumSize( QSize( 0, 50 ) );
+		waveform->setMinimumSize( QSize( 0, 50 ) );
 
-   layout->addMultiCellWidget( waveform, 8, 8, 0, 7 );
-   waveform->setBackgroundColor ( black );
+		layout->addMultiCellWidget( waveform, 8, 8, 0, 7 );
+		waveform->setBackgroundColor ( black );
 }
@@ -755,32 +714,32 @@ void QtRec::initIconView() {
 
-   ListView1->clear();
-   Config cfg("OpieRec");
-   cfg.setGroup("Sounds");
-   QString temp;
-   QPixmap image0( ( const char** ) image0_data );
+		ListView1->clear();
+		Config cfg("OpieRec");
+		cfg.setGroup("Sounds");
+		QString temp;
+		QPixmap image0( ( const char** ) image0_data );
 
-   int nFiles = cfg.readNumEntry("NumberofFiles",0);
-   qDebug("init number of files %d", nFiles);
+		int nFiles = cfg.readNumEntry("NumberofFiles",0);
+//		qDebug("init number of files %d", nFiles);
 
-   for(int i=1;i<= nFiles;i++) {
+		for(int i=1;i<= nFiles;i++) {
 
-      QListViewItem * item;
-      QString fileS, mediaLocation, fileDate,  filePath;
+				QListViewItem * item;
+				QString fileS, mediaLocation, fileDate,  filePath;
 
-      temp.sprintf( "%d",i);
-      temp = cfg.readEntry( temp,""); //reads currentFile
-      filePath = cfg.readEntry( temp,""); //currentFileName
+				temp.sprintf( "%d",i);
+				temp = cfg.readEntry( temp,""); //reads currentFile
+				filePath = cfg.readEntry( temp,""); //currentFileName
 
-      QFileInfo info(filePath);
-      fileDate = info.lastModified().toString();
+				QFileInfo info(filePath);
+				fileDate = info.lastModified().toString();
 
-      fileS = cfg.readEntry( filePath, "0" );// file length in seconds
-      mediaLocation = getStorage( filePath);
-      if( info.exists()) {
-         item = new QListViewItem( ListView1, temp,  fileS,  mediaLocation, fileDate);
-         item->setPixmap( 0, image0);
-         if( currentFileName == filePath)
-            ListView1->setSelected( item, true);
-      }
-   }
+				fileS = cfg.readEntry( filePath, "0" );// file length in seconds
+				mediaLocation = getStorage( filePath);
+				if( info.exists()) {
+						item = new QListViewItem( ListView1, temp,  fileS,  mediaLocation, fileDate);
+						item->setPixmap( 0, image0);
+						if( currentFileName == filePath)
+								ListView1->setSelected( item, true);
+				}
+		}
 }
@@ -788,57 +747,57 @@ void QtRec::initIconView() {
 void QtRec::initConnections() {
-   connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) );
-
-   connect( toBeginningButton, SIGNAL( pressed()),
-            this, SLOT( rewindPressed() ));
-   connect( toBeginningButton, SIGNAL( released()),
-            this, SLOT( rewindReleased() ));
-   connect( toEndButton, SIGNAL( pressed()),
-            this, SLOT( FastforwardPressed() ));
-   connect( toEndButton, SIGNAL( released()),
-            this, SLOT( FastforwardReleased() ));
-   connect( deleteSoundButton, SIGNAL(released()),
-            this, SLOT( deleteSound() ));
-   connect( Stop_PushButton, SIGNAL(released()),
-            this, SLOT( doPlayBtn() ));
-   connect( Rec_PushButton, SIGNAL(released()),
-            this, SLOT( newSound() ) );
-   connect( TabWidget, SIGNAL( currentChanged( QWidget*)),
-            this, SLOT(thisTab(QWidget*) ));
-   connect( OutputSlider, SIGNAL(sliderReleased()),
-            this, SLOT( changedOutVolume()) );
-   connect( InputSlider, SIGNAL(sliderReleased()),
-            this, SLOT( changedInVolume()) );
-
-   connect( sampleRateComboBox, SIGNAL(activated( int)),
-            this, SLOT( changesamplerateCombo(int)) );
-   connect( bitRateComboBox, SIGNAL(activated( int)),
-            this, SLOT( changebitrateCombo(int)) );
-
-   connect( directoryComboBox, SIGNAL(activated( int)),
-            this, SLOT( changeDirCombo(int)) );
-   connect( sizeLimitCombo, SIGNAL(activated( int)),
-            this, SLOT( changeSizeLimitCombo(int)) );
-
-   connect( stereoCheckBox, SIGNAL(toggled( bool)),
-            this, SLOT( changeStereoCheck(bool)) );
+		connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) );
+
+		connect( toBeginningButton, SIGNAL( pressed()),
+						 this, SLOT( rewindPressed() ));
+		connect( toBeginningButton, SIGNAL( released()),
+						 this, SLOT( rewindReleased() ));
+		connect( toEndButton, SIGNAL( pressed()),
+						 this, SLOT( FastforwardPressed() ));
+		connect( toEndButton, SIGNAL( released()),
+						 this, SLOT( FastforwardReleased() ));
+		connect( deleteSoundButton, SIGNAL(released()),
+						 this, SLOT( deleteSound() ));
+		connect( Stop_PushButton, SIGNAL(released()),
+						 this, SLOT( doPlayBtn() ));
+		connect( Rec_PushButton, SIGNAL(released()),
+						 this, SLOT( newSound() ) );
+		connect( TabWidget, SIGNAL( currentChanged( QWidget*)),
+						 this, SLOT(thisTab(QWidget*) ));
+		connect( OutputSlider, SIGNAL(sliderReleased()),
+						 this, SLOT( changedOutVolume()) );
+		connect( InputSlider, SIGNAL(sliderReleased()),
+						 this, SLOT( changedInVolume()) );
+
+		connect( sampleRateComboBox, SIGNAL(activated( int)),
+						 this, SLOT( changesamplerateCombo(int)) );
+		connect( bitRateComboBox, SIGNAL(activated( int)),
+						 this, SLOT( changebitrateCombo(int)) );
+
+		connect( directoryComboBox, SIGNAL(activated( int)),
+						 this, SLOT( changeDirCombo(int)) );
+		connect( sizeLimitCombo, SIGNAL(activated( int)),
+						 this, SLOT( changeSizeLimitCombo(int)) );
+
+		connect( stereoCheckBox, SIGNAL(toggled( bool)),
+						 this, SLOT( changeStereoCheck(bool)) );
    
-   connect( outMuteCheckBox, SIGNAL(toggled( bool)),
-            this, SLOT( doVolMuting(bool)) );
-   connect( inMuteCheckBox , SIGNAL(toggled( bool)),
-            this, SLOT( doMicMuting(bool)) );
-
-   connect( ListView1,SIGNAL(doubleClicked( QListViewItem*)),
-            this,SLOT( itClick(QListViewItem*)));
-   connect( ListView1, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int)),
-            this,SLOT( listPressed(int, QListViewItem *, const QPoint&, int)) );
-   connect( timeSlider, SIGNAL( sliderMoved( int)),
-            this, SLOT( changeTimeSlider(int) ));
-   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)));
+		connect( outMuteCheckBox, SIGNAL(toggled( bool)),
+						 this, SLOT( doVolMuting(bool)) );
+		connect( inMuteCheckBox , SIGNAL(toggled( bool)),
+						 this, SLOT( doMicMuting(bool)) );
+
+		connect( ListView1,SIGNAL(doubleClicked( QListViewItem*)),
+						 this,SLOT( itClick(QListViewItem*)));
+		connect( ListView1, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int)),
+						 this,SLOT( listPressed(int, QListViewItem *, const QPoint&, int)) );
+		connect( timeSlider, SIGNAL( sliderMoved( int)),
+						 this, SLOT( changeTimeSlider(int) ));
+		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)));
 }
@@ -846,18 +805,18 @@ void QtRec::initConnections() {
 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);
+		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)
@@ -871,32 +830,32 @@ void QtRec::initConfig() {
 
-   filePara.resolution = i;
+		filePara.resolution = i;
 
-   i = cfg.readNumEntry("sizeLimit", 5 );
-   QString temp;
-   sizeLimitCombo->setCurrentItem((i/5));
+		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;
-   }
+		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->setEnabled(false);
-      bitRateComboBox->setCurrentItem(0);
-      filePara.resolution=16;
-   }
+		compressionCheckBox->setChecked( cfg.readBoolEntry("wavCompression",1));
+		if( compressionCheckBox->isChecked()) {
+				bitRateComboBox->setEnabled(false);
+				bitRateComboBox->setCurrentItem(0);
+				filePara.resolution=16;
+		}
 
-   autoMuteCheckBox->setChecked( cfg.readBoolEntry("useAutoMute",0));
-   if( autoMuteCheckBox->isChecked())
-      slotAutoMute(true);
-   else
-      slotAutoMute(false);
+		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));
+		Config cofg( "qpe");
+		cofg.setGroup( "Volume");
+		outMuteCheckBox->setChecked( cofg.readBoolEntry( "Mute",0));
+		inMuteCheckBox->setChecked( cofg.readBoolEntry( "MicMute",0));
 }
@@ -904,10 +863,10 @@ void QtRec::initConfig() {
 void QtRec::stop() {
-   qWarning("STOP");
-   setRecordButton(false);
+		qWarning("STOP");
+		setRecordButton(false);
 
-   if( !recording)
-      endPlaying();
-   else
-      endRecording();
-   timeSlider->setValue(0);
+		if( !recording)
+				endPlaying();
+		else
+				endRecording();
+		timeSlider->setValue(0);
 }
@@ -916,11 +875,11 @@ 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();
-   }
+		if(!stopped) {
+				playLabel2->setText(tr("Play"));
+				stop();
+		} else {
+				if(ListView1->currentItem() == 0) return;
+				playLabel2->setText(tr("Stop"));
+				currentFile = ListView1->currentItem()->text(0);
+				start();
+		}
 }
@@ -928,14 +887,14 @@ void QtRec::doPlayBtn() {
 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;
-
-      if( openPlayFile())
-         if( setupAudio( false))  //recording is false
-            doPlay();
-   }
+		if( stopped) {
+				QPixmap image3( ( const char** ) image3_data );
+				Stop_PushButton->setPixmap( image3 );
+				Stop_PushButton->setDown( true);
+				stopped = false;
+				paused = false;
+				secCount = 1;
+
+				if( openPlayFile())
+						if( setupAudio( false))  //recording is false
+								doPlay();
+		}
 }
@@ -943,19 +902,19 @@ void QtRec::start() { //play
 bool QtRec::rec() { //record
-   QString timeString;
-   timeString.sprintf("%.0f",  0.0);
-   timeLabel->setText( timeString+ " seconds");
-   if(!stopped) {
-      monitoring = true;
-      return false;
-   } else {
-      secCount = 1;
-      playLabel2->setText(tr("Stop"));
-      monitoring = false;
-      setRecordButton( true);
-
-      if( setupAudio( true))
-         if(setUpFile())  {
-            int fileSize = 0;
-            Config cfg("OpieRec");
-            cfg.setGroup("Settings");
+		QString timeString;
+		timeString.sprintf("%.0f",  0.0);
+		timeLabel->setText( timeString+ " seconds");
+		if(!stopped) {
+				monitoring = true;
+				return false;
+		} else {
+				secCount = 1;
+				playLabel2->setText(tr("Stop"));
+				monitoring = false;
+				setRecordButton( true);
+
+				if( setupAudio( true))
+						if(setUpFile())  {
+								int fileSize = 0;
+								Config cfg("OpieRec");
+								cfg.setGroup("Settings");
 //             qDebug( "<<<<<<<Device bits %d, device rate %d, device channels %d",
@@ -965,61 +924,65 @@ bool QtRec::rec() { //record
 
-            //filePara.sampleRate = cfg.readNumEntry("samplerate", 22050);
+									//filePara.sampleRate = cfg.readNumEntry("samplerate", 22050);
 //             qDebug("sample rate is %d", filePara.sampleRate);
-            filePara.SecondsToRecord = getCurrentSizeLimit();
+								filePara.SecondsToRecord = getCurrentSizeLimit();
 
 //             qDebug("size limit %d sec", filePara.SecondsToRecord);
-            int diskSize = checkDiskSpace( (const QString &) wavFile->trackName());
+								int diskSize = checkDiskSpace( (const QString &) wavFile->trackName());
 
-            if( filePara.SecondsToRecord == 0) {
-               fileSize = diskSize;
-            } else if( filePara.format == WAVE_FORMAT_PCM) {
+								if( filePara.SecondsToRecord == 0) {
+										fileSize = diskSize;
+								} else if( filePara.format == WAVE_FORMAT_PCM) {
 //                qDebug("WAVE_FORMAT_PCM");
-               fileSize = (filePara.SecondsToRecord ) * filePara.channels
-                          * filePara.sampleRate * ( filePara.resolution / 8) + 1000;
-            } else {
+										fileSize = (filePara.SecondsToRecord ) * filePara.channels
+												* filePara.sampleRate * ( filePara.resolution / 8) + 1000;
+								} else {
 //                qDebug("WAVE_FORMAT_DVI_ADPCM");
-               fileSize = ((filePara.SecondsToRecord) * filePara.channels
-                           * filePara.sampleRate * ( filePara.resolution / 8) ) / 4 + 250;
-            }
-
-            filePara.samplesToRecord = fileSize;
-            qDebug("filesize should be %d, bits %d, rate %d",
-                   filePara.samplesToRecord, filePara.resolution, filePara.sampleRate);
-            if( paused) {
-               paused = false;
-            }
-            //                  else {
-            qDebug("Setting timeslider %d", filePara.samplesToRecord);
-            //           if(fileSize != 0)
-            timeSlider->setRange(0, filePara.samplesToRecord);
-            //                  }
-
-            if( diskSize < fileSize/1024) {
-               QMessageBox::warning(this,
-                                    tr("Low Disk Space"),
-                                    tr("You are running low of\nrecording space\n"
-                                       "or a card isn't being recognized"));
-               stopped = true; //we need to be stopped
-               stop();
-            } else {
-               QString msg;
-               msg.sprintf("%d, %d, %d", filePara.sampleRate, filePara.channels, filePara.resolution);
+										fileSize = ((filePara.SecondsToRecord) * filePara.channels
+																* filePara.sampleRate * ( filePara.resolution / 8) ) / 4 + 250;
+								}
+
+								filePara.samplesToRecord = fileSize;
+								qDebug("filesize should be %d, bits %d, rate %d",
+											 filePara.samplesToRecord, filePara.resolution, filePara.sampleRate);
+								if( paused) {
+										paused = false;
+								}
+									//                  else {
+								qDebug("Setting timeslider %d", filePara.samplesToRecord);
+									//           if(fileSize != 0)
+								timeSlider->setRange(0, filePara.samplesToRecord);
+									//                  }
+
+								if( diskSize < fileSize/1024) {
+										QMessageBox::warning(this,
+																				 tr("Low Disk Space"),
+																				 tr("You are running low of\nrecording space\n"
+																						"or a card isn't being recognized"));
+										stopped = true; //we need to be stopped
+										stop();
+								} else {
+										QString msg;
+										msg.sprintf("%d, %d, %d", filePara.sampleRate, filePara.channels, filePara.resolution);
 #ifdef DEV_VERSION
-               setCaption( msg);
+										setCaption( msg);
 #endif
-               filePara.fileName=currentFile.latin1();
-//               qDebug("Start recording thread");
-               stopped = false;
-
-//                 pthread_t thread1;
-//                 pthread_create( &thread1, NULL, (void * (*)(void *))quickRec, NULL/* &*/);
-               toBeginningButton->setEnabled( false);
-               toEndButton->setEnabled( false);
-
-               startTimer(1000);
-               quickRec();
-            }
-         } //end setUpFile
-   } //end setupAudio
-   return true;
+										filePara.fileName=currentFile.latin1();
+										qDebug("Start recording thread");
+										stopped = false;
+
+#ifdef THREADED
+										pthread_t thread1;
+										pthread_create( &thread1, NULL, (void * (*)(void *))quickRec, NULL/* &*/);
+#endif
+										toBeginningButton->setEnabled( false);
+										toEndButton->setEnabled( false);
+
+										startTimer(1000);
+#ifndef THREADED
+										quickRec();
+#endif
+								}
+						} //end setUpFile
+		} //end setupAudio
+		return true;
 }
@@ -1028,20 +991,20 @@ bool QtRec::rec() { //record
 void QtRec::thisTab(QWidget* widg) {
-   if(widg != NULL) {
-      int index = TabWidget->currentPageIndex();
+		if(widg != NULL) {
+				int index = TabWidget->currentPageIndex();
 
-      if(index == 0) { //file page
-      }
+				if(index == 0) { //file page
+				}
 
-      if(index == 1) { //control page
-         fillDirectoryCombo();
+				if(index == 1) { //control page
+						fillDirectoryCombo();
 //       soundDevice->getOutVol();
 //       soundDevice->getInVol();
-      }
+				}
 
-      if( index==2) { //help page
-      }
+				if( index==2) { //help page
+				}
       
-      qApp->processEvents();
-      update();
-   }
+				qApp->processEvents();
+				update();
+		}
 }
@@ -1049,5 +1012,5 @@ void QtRec::thisTab(QWidget* widg) {
 void QtRec::getOutVol( ) {
-   filePara.outVol = soundDevice->getOutVolume();
+		filePara.outVol = soundDevice->getOutVolume();
 //   qDebug("out vol %d", filePara.outVol);
-   OutputSlider->setValue( -filePara.outVol);
+		OutputSlider->setValue( -filePara.outVol);
 }
@@ -1055,5 +1018,5 @@ void QtRec::getOutVol( ) {
 void QtRec::getInVol() {
-   filePara.inVol = soundDevice->getInVolume();
+		filePara.inVol = soundDevice->getInVolume();
 //    qDebug("in vol %d", filePara.inVol);
-   InputSlider->setValue( -filePara.inVol);
+		InputSlider->setValue( -filePara.inVol);
 }
@@ -1061,3 +1024,3 @@ void QtRec::getInVol() {
 void QtRec::changedOutVolume() {
-   soundDevice->changedOutVolume( -OutputSlider->value());
+		soundDevice->changedOutVolume( -OutputSlider->value());
 }
@@ -1065,3 +1028,3 @@ void QtRec::changedOutVolume() {
 void QtRec::changedInVolume( ) {
-   soundDevice->changedInVolume( -InputSlider->value());
+		soundDevice->changedInVolume( -InputSlider->value());
 }
@@ -1070,10 +1033,11 @@ void QtRec::changedInVolume( ) {
 bool QtRec::setupAudio( bool b) {
-   bool ok;
-   int  sampleformat, stereo, flags;
-   char * dspString, *mixerString;
+		bool ok;
+		int  sampleformat, stereo, flags;
+		QString dspString, mixerString;
 
-   filePara.resolution = bitRateComboBox->currentText().toInt( &ok,10);  //16
+		filePara.resolution = bitRateComboBox->currentText().toInt( &ok,10);  //16
 
+		if( !b) {
+// we want to play
 #ifdef PDAUDIO //ALSA
-		if( !b) { // we want to play
 				if( filePara.resolution == 16 || compressionCheckBox->isChecked() ) {
@@ -1092,19 +1056,20 @@ bool QtRec::setupAudio( bool b) {
 #else
-   if( !b) {
 // we want to play
-      if( filePara.resolution == 16 || compressionCheckBox->isChecked() ) {
-         sampleformat = AFMT_S16_LE;
-         filePara.resolution = 16;
-      } else {
-         sampleformat = AFMT_U8;
-         filePara.resolution = 8;
-      }
+				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;
-      dspString = DSPSTROUT;
-      mixerString = DSPSTRMIXEROUT;
-      recording = false;
-   } else { // we want to record
+				stereo = filePara.channels;
+				flags = O_WRONLY;
+				Config hwcfg("OpieRec");
+				hwcfg.setGroup("Hardware");
+				dspString = hwcfg.readEntry( "Audio", DSPSTROUT);
+				mixerString = hwcfg.readEntry( "Mixer", DSPSTRMIXEROUT);
+				recording = false;
+		} else { // we want to record
 
@@ -1121,62 +1086,64 @@ bool QtRec::setupAudio( bool b) {
 #else
-			 if( !bitRateComboBox->isEnabled() || bitRateComboBox->currentText() == "16")
-         sampleformat = AFMT_S16_LE;
-      else
-         sampleformat = AFMT_U8;
+				if( !bitRateComboBox->isEnabled() || bitRateComboBox->currentText() == "16")
+						sampleformat = AFMT_S16_LE;
+				else
+						sampleformat = AFMT_U8;
 
-      if( !compressionCheckBox->isChecked()) {
-         filePara.format = WAVE_FORMAT_PCM;
+				if( !compressionCheckBox->isChecked()) {
+						filePara.format = WAVE_FORMAT_PCM;
 //          qDebug("WAVE_FORMAT_PCM");
-      }  else {
-         filePara.format = WAVE_FORMAT_DVI_ADPCM;
-         sampleformat = AFMT_S16_LE;
+				}  else {
+						filePara.format = WAVE_FORMAT_DVI_ADPCM;
+						sampleformat = AFMT_S16_LE;
 //          qDebug("WAVE_FORMAT_DVI_ADPCM");
-      }
+				}
 #endif
 			
-      stereo = filePara.channels;
+				stereo = filePara.channels;
 //        filePara.sampleRate = sampleRateComboBox->currentText().toInt( &ok,10);//44100;
-      flags= O_RDWR;
+				flags= O_RDWR;
 //        flags= O_RDONLY;
-      dspString = DSPSTRIN;
-      mixerString = DSPSTRMIXEROUT;
-      recording = true;
-   }
+				Config hwcfg("OpieRec");
+				hwcfg.setGroup("Hardware");
+				dspString = hwcfg.readEntry( "Audio", DSPSTRIN);
+				mixerString = hwcfg.readEntry( "Mixer", DSPSTRMIXERIN);
+				recording = true;
+		}
 
-   // if(soundDevice) delete soundDevice;
-   qDebug("<<<<<<<<<<<<<<<<<<<open dsp %d %d %d", filePara.sampleRate, filePara.channels, sampleformat);
-   qWarning("change waveform settings");
-   waveform->changeSettings( filePara.sampleRate, filePara.channels );
+			// if(soundDevice) delete soundDevice;
+		qDebug("<<<<<<<<<<<<<<<<<<<open dsp %d %d %d", filePara.sampleRate, filePara.channels, sampleformat);
+		qWarning("change waveform settings");
+		waveform->changeSettings( filePara.sampleRate, filePara.channels );
 
-   soundDevice = new Device( this, dspString, mixerString, b);
+		soundDevice = new Device( this, dspString, mixerString, b);
 //    soundDevice->openDsp();
-   soundDevice->reset();
+		soundDevice->reset();
 
-   qDebug("device has been made %d", soundDevice->sd);
+		qDebug("device has been made %d", soundDevice->sd);
 
-   //////////////////         <<<<<<<<<<<<>>>>>>>>>>>>
-   soundDevice->setDeviceFormat( sampleformat);
-   soundDevice->setDeviceChannels( filePara.channels);
-   soundDevice->setDeviceRate( filePara.sampleRate);
-   soundDevice->getDeviceFragSize();
+			//////////////////         <<<<<<<<<<<<>>>>>>>>>>>>
+		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();
+		int frag = FRAGSIZE;
+		soundDevice->setFragSize( frag);
+		soundDevice->getDeviceFragSize();
 #endif
-   /////////////////
-   filePara.sd = soundDevice->sd;
+			/////////////////
+		filePara.sd = soundDevice->sd;
 
-   if ( filePara.sd == -1) {
+		if ( filePara.sd == -1) {
 
-      monitoring = false;
-      stopped = true;
-      update();
-      setCaption( tr( "OpieRecord " )+ QString::number(VERSION) );
-      return false;
-   }
-   if(autoMute)
-      doMute(false);
+				monitoring = false;
+				stopped = true;
+				update();
+				setCaption( tr( "OpieRecord " )+ QString::number(VERSION) );
+				return false;
+		}
+		if(autoMute)
+				doMute(false);
 
-   return true;
+		return true;
 }
@@ -1187,16 +1154,16 @@ bool QtRec::setUpFile() { //setup file for recording
 //  if(wavFile) delete wavFile;
-   wavFile = new WavFile( this, (const QString &)"",
-                          true,
-                          filePara.sampleRate,
-                          filePara.channels,
-                          filePara.resolution,
-                          filePara.format);
-
-   filePara.fd = wavFile->wavHandle();
-   if(filePara.fd == -1) {
-      return false;
-   } else {
+		wavFile = new WavFile( this, (const QString &)"",
+													 true,
+													 filePara.sampleRate,
+													 filePara.channels,
+													 filePara.resolution,
+													 filePara.format);
+
+		filePara.fd = wavFile->wavHandle();
+		if(filePara.fd == -1) {
+				return false;
+		} else {
 //      filePara.channels=1;
-   }
-   return true;
+		}
+		return true;
 }
@@ -1206,15 +1173,15 @@ bool QtRec::doPlay() {
 
-   if( !paused) {
-      total = 0;
-      filePara.numberOfRecordedSeconds = 0;
-   } else {
-      paused = false;
-      secCount = (int)filePara.numberOfRecordedSeconds;
-   }
-   playing = true;
-   stopped = false;
-   recording = false;
+		if( !paused) {
+				total = 0;
+				filePara.numberOfRecordedSeconds = 0;
+		} else {
+				paused = false;
+				secCount = (int)filePara.numberOfRecordedSeconds;
+		}
+		playing = true;
+		stopped = false;
+		recording = false;
 
-   QString num;
-   qDebug( "Play number of samples %d", filePara.numberSamples);
+		QString num;
+		qDebug( "Play number of samples %d", filePara.numberSamples);
 
@@ -1222,23 +1189,26 @@ bool QtRec::doPlay() {
 
-   timeString.sprintf("%d",  filePara.numberOfRecordedSeconds);
-   timeLabel->setText( timeString+ tr(" seconds"));
+		timeString.sprintf("%f",  filePara.numberOfRecordedSeconds);
+		timeLabel->setText( timeString+ tr(" seconds"));
 
-   QString msg;
-   msg.sprintf("%d, %d, %d",
-               filePara.sampleRate,
-               filePara.channels,
-               filePara.resolution);
+		QString msg;
+		msg.sprintf("%d, %d, %d",
+								filePara.sampleRate,
+								filePara.channels,
+								filePara.resolution);
 #ifdef DEV_VERSION
-   setCaption( msg);
+		setCaption( msg);
 #endif
 
-    startTimer( 1000);
-//     pthread_t thread2;
-//     pthread_create( &thread2, NULL, (void * (*)(void *))playIt, NULL/* &*/);
-
-    toBeginningButton->setEnabled( false);
-    toEndButton->setEnabled( false);
+		startTimer( 1000);
+#ifdef THREADED
+		pthread_t thread2;
+		pthread_create( &thread2, NULL, (void * (*)(void *))playIt, NULL/* &*/);
+#endif
+		 
+		toBeginningButton->setEnabled( false);
+		toEndButton->setEnabled( false);
+#ifndef  THREADED
 		playIt();
-
-   return true;
+#endif
+		return true;
 }
@@ -1247,5 +1217,5 @@ bool QtRec::doPlay() {
 void QtRec::changebitrateCombo(int i) {
-   Config cfg("OpieRec");
-   cfg.setGroup("Settings");
-   int bits = 0;
+		Config cfg("OpieRec");
+		cfg.setGroup("Settings");
+		int bits = 0;
 		if( i == 1) { bits = 16; }
@@ -1254,5 +1224,5 @@ void QtRec::changebitrateCombo(int i) {
 		else { bits=8; }
-   cfg.writeEntry("bitrate", bits);
-   filePara.resolution = bits;
-   cfg.write();
+		cfg.writeEntry("bitrate", bits);
+		filePara.resolution = bits;
+		cfg.write();
 }
@@ -1260,11 +1230,11 @@ void QtRec::changebitrateCombo(int i) {
 void QtRec::changesamplerateCombo(int i) {
-   Config cfg("OpieRec");
-   cfg.setGroup("Settings");
-   int rate=0;
-   bool ok;
-   rate = sampleRateComboBox->text(i).toInt(&ok, 10);
-   cfg.writeEntry( "samplerate",rate);
-   filePara.sampleRate=rate;
-   qDebug( "Change sample rate %d", rate);
-   cfg.write();
+		Config cfg("OpieRec");
+		cfg.setGroup("Settings");
+		int rate=0;
+		bool ok;
+		rate = sampleRateComboBox->text(i).toInt(&ok, 10);
+		cfg.writeEntry( "samplerate",rate);
+		filePara.sampleRate=rate;
+		qDebug( "Change sample rate %d", rate);
+		cfg.write();
 }
@@ -1273,20 +1243,20 @@ void QtRec::changesamplerateCombo(int i) {
 void QtRec::changeDirCombo(int index) {
-   Config cfg("OpieRec");
-   cfg.setGroup("Settings");
-   QString sName = directoryComboBox->text(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);
-         qDebug("new rec dir "+recDir);
-      }
-   }
-   cfg.write();
+		Config cfg("OpieRec");
+		cfg.setGroup("Settings");
+		QString sName = directoryComboBox->text(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);
+						qDebug("new rec dir "+recDir);
+				}
+		}
+		cfg.write();
 }
@@ -1295,6 +1265,6 @@ void QtRec::changeDirCombo(int index) {
 void QtRec::changeSizeLimitCombo(int) {
-   Config cfg("OpieRec");
-   cfg.setGroup("Settings");
-   cfg.writeEntry("sizeLimit", getCurrentSizeLimit() );
-   cfg.write();
+		Config cfg("OpieRec");
+		cfg.setGroup("Settings");
+		cfg.writeEntry("sizeLimit", getCurrentSizeLimit() );
+		cfg.write();
 }
@@ -1302,6 +1272,6 @@ void QtRec::changeSizeLimitCombo(int) {
 void QtRec::newSound() {
-   if( !rec()) {
-      endRecording();
-      deleteSound();
-   }
+		if( !rec()) {
+				endRecording();
+				deleteSound();
+		}
 }
@@ -1309,4 +1279,4 @@ void QtRec::newSound() {
 void QtRec::itClick(QListViewItem *item) {
-   currentFile = item->text(0);
-   setCaption("OpieRecord  "+currentFile);
+		currentFile = item->text(0);
+		setCaption("OpieRecord  "+currentFile);
 }
@@ -1314,50 +1284,50 @@ void QtRec::itClick(QListViewItem *item) {
 void QtRec::deleteSound() {
-   Config cfg("OpieRec");
-   cfg.setGroup("Sounds");
-   if( ListView1->currentItem() == NULL)
-      return;
+		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:
+		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();
+			}
 #ifndef DEV_VERSION
-   };
+		};
 #endif
-   setCaption( tr( "OpieRecord " ) + QString::number(VERSION) );
+		setCaption( tr( "OpieRecord " ) + QString::number(VERSION) );
 
@@ -1367,53 +1337,53 @@ 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: {
-      qDebug("rewinding");
-      if( !e->isAutoRepeat())
-         rewindPressed();
-   }
-      break;
-   case Key_Right: {
-      if( !e->isAutoRepeat())
-         FastforwardPressed();
-   }
-      break;
-   }
+		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: {
+					qDebug("rewinding");
+					if( !e->isAutoRepeat())
+							rewindPressed();
+			}
+					break;
+			case Key_Right: {
+					if( !e->isAutoRepeat())
+							FastforwardPressed();
+			}
+					break;
+		}
 }
@@ -1421,58 +1391,58 @@ void QtRec::keyPressEvent( QKeyEvent *e) {
 void  QtRec::keyReleaseEvent( QKeyEvent *e) {
-   switch ( e->key() ) {
-      //   case Key_F1:
-      //      if(stopped && !recording)
-      //        newSound();
-      //      else
-      //        stop();
-      //     break;
-      //   case Key_F2:
-      //     rewindReleased();
-      //     break;
-      //   case Key_F3:
-      //     FastforwardReleased();
-      //     break;
-
-      ////////////////////////////// Zaurus keys
-   case Key_F9: //activity
-      break;
-   case Key_F10: //contacts
-      break;
-   case Key_F11: //menu
-      break;
-   case Key_F12: //home
-      if(stopped)
-         doPlayBtn();
-      else
-         stop();
-      break;
-   case Key_F13: //mail
-      break;
-   case Key_Space:
-      if(stopped && !recording)
-         newSound();
-      else
-         stop();
-      break;
-   case Key_Delete:
-      deleteSound();
-      break;
-   case Key_Up:
-      //      stop();
-      qDebug("Up");
-      break;
-   case Key_Down:
-      //      start();
-      //      qDebug("Down");
-      //    newSound();
-      break;
-   case Key_Left:
-      qDebug("Left");
-      rewindReleased();
-      break;
-   case Key_Right:
-      qDebug("Right");
-      FastforwardReleased();
-      break;
-   }
+		switch ( e->key() ) {
+					//   case Key_F1:
+					//      if(stopped && !recording)
+					//        newSound();
+					//      else
+					//        stop();
+					//     break;
+					//   case Key_F2:
+					//     rewindReleased();
+					//     break;
+					//   case Key_F3:
+					//     FastforwardReleased();
+					//     break;
+
+					////////////////////////////// Zaurus keys
+			case Key_F9: //activity
+					break;
+			case Key_F10: //contacts
+					break;
+			case Key_F11: //menu
+					break;
+			case Key_F12: //home
+					if(stopped)
+							doPlayBtn();
+					else
+							stop();
+					break;
+			case Key_F13: //mail
+					break;
+			case Key_Space:
+					if(stopped && !recording)
+							newSound();
+					else
+							stop();
+					break;
+			case Key_Delete:
+					deleteSound();
+					break;
+			case Key_Up:
+						//      stop();
+					qDebug("Up");
+					break;
+			case Key_Down:
+						//      start();
+						//      qDebug("Down");
+						//    newSound();
+					break;
+			case Key_Left:
+					qDebug("Left");
+					rewindReleased();
+					break;
+			case Key_Right:
+					qDebug("Right");
+					FastforwardReleased();
+					break;
+		}
 }
@@ -1480,62 +1450,62 @@ void  QtRec::keyReleaseEvent( QKeyEvent *e) {
 void QtRec::endRecording() {
-   monitoring = false;
-   recording = false;
-   stopped = true;
-   waveform->reset();
-   setRecordButton( false);
+		monitoring = false;
+		recording = false;
+		stopped = true;
+		waveform->reset();
+		setRecordButton( false);
 
-   toBeginningButton->setEnabled( true);
-   toEndButton->setEnabled( true);
+		toBeginningButton->setEnabled( true);
+		toEndButton->setEnabled( true);
 
-   killTimers();
+		killTimers();
 
-   if(autoMute)
-      doMute( true);
+		if(autoMute)
+				doMute( true);
 
-   soundDevice->closeDevice( 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->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()) {
+				if( wavFile->isTempFile()) {
 // move tmp file to regular file
-         QString cmd;
-         cmd.sprintf("mv "+ wavFile->trackName() + " " + wavFile->currentFileName);
+						QString cmd;
+						cmd.sprintf("mv "+ wavFile->trackName() + " " + wavFile->currentFileName);
 //         qDebug("moving tmp file to "+currentFileName);
-         system( cmd.latin1());
-      }
+						system( cmd.latin1());
+				}
       
-      qDebug("Just moved " + wavFile->currentFileName);
-      Config cfg("OpieRec");
-      cfg.setGroup("Sounds");
+				qDebug("Just moved " + wavFile->currentFileName);
+				Config cfg("OpieRec");
+				cfg.setGroup("Sounds");
 
-      int nFiles = cfg.readNumEntry( "NumberofFiles",0);
+				int nFiles = cfg.readNumEntry( "NumberofFiles",0);
 
-      currentFile = QFileInfo( wavFile->currentFileName).fileName();
-      currentFile = currentFile.left( currentFile.length() - 4);
+				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);
+				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 );
+				QString time;
+				time.sprintf("%.2f", filePara.numberOfRecordedSeconds);
+				cfg.writeEntry( wavFile->currentFileName, time );
 //       qDebug("writing config numberOfRecordedSeconds "+time);
 
-      cfg.write();
-      qDebug("finished recording");
-      timeLabel->setText("");
-   }
+				cfg.write();
+				qDebug("finished recording");
+				timeLabel->setText("");
+		}
 
-   if(soundDevice) delete soundDevice;
+		if(soundDevice) delete soundDevice;
 
-   timeSlider->setValue(0);
-   initIconView();
-   selectItemByName( currentFile);
+		timeSlider->setValue(0);
+		initIconView();
+		selectItemByName( currentFile);
 }
@@ -1543,27 +1513,27 @@ void QtRec::endRecording() {
 void QtRec::endPlaying() {
-   monitoring = false;
-   recording = false;
-   playing = false;
-   stopped = true;
-   waveform->reset();
+		monitoring = false;
+		recording = false;
+		playing = false;
+		stopped = true;
+		waveform->reset();
 //   errorStop();
 //    qDebug("end playing");
-   setRecordButton( false);
+		setRecordButton( false);
 
-   toBeginningButton->setEnabled( true);
-   toEndButton->setEnabled( true);
+		toBeginningButton->setEnabled( true);
+		toEndButton->setEnabled( true);
 
-   if(autoMute)
-      doMute( true);
+		if(autoMute)
+				doMute( true);
 
-   soundDevice->closeDevice( false);
-   soundDevice->sd = -1;
-   //  if(soundDevice) delete soundDevice;
+		soundDevice->closeDevice( false);
+		soundDevice->sd = -1;
+			//  if(soundDevice) delete soundDevice;
 //    qDebug("file and sound device closed");
-   timeLabel->setText("");
-   total = 0;
-   filePara.numberSamples = 0;
-   filePara.sd = -1;
+		timeLabel->setText("");
+		total = 0;
+		filePara.numberSamples = 0;
+		filePara.sd = -1;
 //   wavFile->closeFile();
-   filePara.fd = 0;
+		filePara.fd = 0;
 //  if(wavFile) delete wavFile; //this crashes
@@ -1571,7 +1541,7 @@ void QtRec::endPlaying() {
 //    qDebug("track closed");
-   killTimers();
-   qWarning("reset slider");
-   timeSlider->setValue(0);
+		killTimers();
+		qWarning("reset slider");
+		timeSlider->setValue(0);
 
-   if(soundDevice) delete soundDevice;
+		if(soundDevice) delete soundDevice;
 
@@ -1581,49 +1551,49 @@ bool QtRec::openPlayFile() {
 
-   qApp->processEvents();
-   if( currentFile.isEmpty()) {
-      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, "" );
-         qDebug("opening for play: " + currentFileName);
-      }
-   }
-   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 " ) + QString::number(VERSION) );
-      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;
-
-      qDebug("file %d, samples %d %d", filePara.fd, filePara.numberSamples, filePara.sampleRate);
-      int sec = (int) (( filePara.numberSamples / filePara.sampleRate) / filePara.channels) / ( filePara.channels*( filePara.resolution/8));
-
-      qWarning("seconds %d", sec);
-
-      timeSlider->setRange(0, filePara.numberSamples );
-   }
-
-   return true;
+		qApp->processEvents();
+		if( currentFile.isEmpty()) {
+				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, "" );
+						qDebug("opening for play: " + currentFileName);
+				}
+		}
+		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 " ) + QString::number(VERSION) );
+				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;
+
+				qDebug("file %d, samples %d %d", filePara.fd, filePara.numberSamples, filePara.sampleRate);
+				int sec = (int) (( filePara.numberSamples / filePara.sampleRate) / filePara.channels) / ( filePara.channels*( filePara.resolution/8));
+
+				qWarning("seconds %d", sec);
+
+				timeSlider->setRange(0, filePara.numberSamples );
+		}
+
+		return true;
 }
@@ -1631,18 +1601,18 @@ bool QtRec::openPlayFile() {
 void QtRec::listPressed( int mouse, QListViewItem *item, const QPoint &, int ) {
-   if(item == NULL )
-      return;
-   switch (mouse) {
-   case 1: {
-      if( renameBox != 0 ) //tricky
-         cancelRename();
-
-      currentFile = item->text(0);
-      setCaption( "OpieRecord  " + currentFile);
-   }
-      break;
-   case 2:
-      showListMenu(item);
-      ListView1->clearSelection();
-      break;
-   };
+		if(item == NULL )
+				return;
+		switch (mouse) {
+			case 1: {
+					if( renameBox != 0 ) //tricky
+							cancelRename();
+
+					currentFile = item->text(0);
+					setCaption( "OpieRecord  " + currentFile);
+			}
+					break;
+			case 2:
+					showListMenu(item);
+					ListView1->clearSelection();
+					break;
+		};
 }
@@ -1650,15 +1620,15 @@ void QtRec::listPressed( int mouse, QListViewItem *item, const QPoint &, int ) {
 void QtRec::showListMenu(QListViewItem * item) {
-   if(item == NULL)
-      return;
-   QPopupMenu *m = new QPopupMenu(this);
-   m->insertItem( tr("Play"), this, SLOT( doMenuPlay() ));
-   if(Ir::supported())  m->insertItem( tr( "Send with Ir" ), this, SLOT( doBeam() ));
-   m->insertItem( tr( "Rename" ), this, SLOT( doRename() ));
-   // #if defined (QTOPIA_INTERNAL_FSLP)
-   //     m->insertItem( tr( "Properties" ), this, SLOT( doProperties() ));
-   // #endif
-   m->insertSeparator();
-   m->insertItem( tr("Delete"), this, SLOT( deleteSound() ) );
-   m->exec( QCursor::pos() );
-   qApp->processEvents();
+		if(item == NULL)
+				return;
+		QPopupMenu *m = new QPopupMenu(this);
+		m->insertItem( tr("Play"), this, SLOT( doMenuPlay() ));
+		if(Ir::supported())  m->insertItem( tr( "Send with Ir" ), this, SLOT( doBeam() ));
+		m->insertItem( tr( "Rename" ), this, SLOT( doRename() ));
+			// #if defined (QTOPIA_INTERNAL_FSLP)
+			//     m->insertItem( tr( "Properties" ), this, SLOT( doProperties() ));
+			// #endif
+		m->insertSeparator();
+		m->insertItem( tr("Delete"), this, SLOT( deleteSound() ) );
+		m->exec( QCursor::pos() );
+		qApp->processEvents();
 }
@@ -1666,4 +1636,4 @@ void QtRec::showListMenu(QListViewItem * item) {
 void QtRec::fileBeamFinished( Ir *ir) {
-   if(ir)
-      QMessageBox::message( tr("Ir Beam out"), tr("Ir sent.") ,tr("Ok") );
+		if(ir)
+				QMessageBox::message( tr("Ir Beam out"), tr("Ir sent.") ,tr("Ok") );
 
@@ -1672,23 +1642,23 @@ void QtRec::fileBeamFinished( Ir *ir) {
 void QtRec::doBeam() {
-   qApp->processEvents();
-   if(  ListView1->currentItem() == NULL)
-      return;
-   Ir ir;
-   if( ir.supported()) {
-      QString file = ListView1->currentItem()->text(0);
-      Config cfg("OpieRec");
-      cfg.setGroup("Sounds");
-
-      int nFiles = cfg.readNumEntry("NumberofFiles",0);
-
-      for(int i=0;i<nFiles+1;i++) {
-         if( cfg.readEntry( QString::number( i),"").find( file, 0, true) != -1) {
-            QString filePath = cfg.readEntry(file,"");
-            Ir *file = new Ir(this, "IR");
-            connect( file, SIGNAL( done(Ir*)),
-                     this, SLOT( fileBeamFinished( Ir * )));
-            file->send( filePath, "OPieRec audio file\n" + filePath );
-         }
-      }
-   }
+		qApp->processEvents();
+		if(  ListView1->currentItem() == NULL)
+				return;
+		Ir ir;
+		if( ir.supported()) {
+				QString file = ListView1->currentItem()->text(0);
+				Config cfg("OpieRec");
+				cfg.setGroup("Sounds");
+
+				int nFiles = cfg.readNumEntry("NumberofFiles",0);
+
+				for(int i=0;i<nFiles+1;i++) {
+						if( cfg.readEntry( QString::number( i),"").find( file, 0, true) != -1) {
+								QString filePath = cfg.readEntry(file,"");
+								Ir *file = new Ir(this, "IR");
+								connect( file, SIGNAL( done(Ir*)),
+												 this, SLOT( fileBeamFinished( Ir * )));
+								file->send( filePath, "OPieRec audio file\n" + filePath );
+						}
+				}
+		}
 }
@@ -1696,4 +1666,4 @@ void QtRec::doBeam() {
 void QtRec::doMenuPlay() {
-   qApp->processEvents();
-   currentFile = ListView1->currentItem()->text(0);
+		qApp->processEvents();
+		currentFile = ListView1->currentItem()->text(0);
 }
@@ -1701,20 +1671,20 @@ void QtRec::doMenuPlay() {
 void QtRec::doRename() {
-   QRect r = ListView1->itemRect( ListView1->currentItem( ));
-   r = QRect( ListView1->viewportToContents( r.topLeft() ), r.size() );
-   r.setX( ListView1->contentsX() );
-   if ( r.width() > ListView1->visibleWidth() )
-      r.setWidth( ListView1->visibleWidth() );
+		QRect r = ListView1->itemRect( ListView1->currentItem( ));
+		r = QRect( ListView1->viewportToContents( r.topLeft() ), r.size() );
+		r.setX( ListView1->contentsX() );
+		if ( r.width() > ListView1->visibleWidth() )
+				r.setWidth( ListView1->visibleWidth() );
 
-   renameBox = new QLineEdit( ListView1->viewport(), "qt_renamebox" );
-   renameBox->setFrame(true);
+		renameBox = new QLineEdit( ListView1->viewport(), "qt_renamebox" );
+		renameBox->setFrame(true);
 
-   renameBox->setText(  ListView1->currentItem()->text(0) );
+		renameBox->setText(  ListView1->currentItem()->text(0) );
 
-   renameBox->selectAll();
-   renameBox->installEventFilter( this );
-   ListView1->addChild( renameBox, r.x(), r.y() );
-   renameBox->resize( r.size() );
-   ListView1->viewport()->setFocusProxy( renameBox );
-   renameBox->setFocus();
-   renameBox->show();
+		renameBox->selectAll();
+		renameBox->installEventFilter( this );
+		ListView1->addChild( renameBox, r.x(), r.y() );
+		renameBox->resize( r.size() );
+		ListView1->viewport()->setFocusProxy( renameBox );
+		renameBox->setFocus();
+		renameBox->show();
 
@@ -1723,35 +1693,35 @@ void QtRec::doRename() {
 void QtRec::okRename() {
-   qDebug(renameBox->text());
-   QString  filename = renameBox->text();
-   cancelRename();
+		qDebug(renameBox->text());
+		QString  filename = renameBox->text();
+		cancelRename();
 
-   if(  ListView1->currentItem() == NULL)
-      return;
+		if(  ListView1->currentItem() == NULL)
+				return;
 
-   Config cfg("OpieRec");
-   cfg.setGroup("Sounds");
+		Config cfg("OpieRec");
+		cfg.setGroup("Sounds");
 
-   QString file = ListView1->currentItem()->text(0);
+		QString file = ListView1->currentItem()->text(0);
 
-   qDebug("filename is  " + filename);
+		qDebug("filename is  " + filename);
 
-   int nFiles = cfg.readNumEntry("NumberofFiles",0);
+		int nFiles = cfg.readNumEntry("NumberofFiles",0);
 
-   for(int i=0;i<nFiles+1;i++) { //look for file
-      if( cfg.readEntry( QString::number(i),"").find(file,0,true) != -1) {
+		for(int i=0;i<nFiles+1;i++) { //look for file
+				if( cfg.readEntry( QString::number(i),"").find(file,0,true) != -1) {
 
-         QString filePath = cfg.readEntry(file,"");
+						QString filePath = cfg.readEntry(file,"");
 
-         cfg.writeEntry( QString::number(i), filename );
-         cfg.writeEntry( filename, filePath );
-         cfg.removeEntry( file);
-         cfg.write();
-      }
-   }
+						cfg.writeEntry( QString::number(i), filename );
+						cfg.writeEntry( filename, filePath );
+						cfg.removeEntry( file);
+						cfg.write();
+				}
+		}
 
-   ListView1->takeItem( ListView1->currentItem() );
-   delete ListView1->currentItem();
-   ListView1->clear();
-   initIconView();
-   update();
+		ListView1->takeItem( ListView1->currentItem() );
+		delete ListView1->currentItem();
+		ListView1->clear();
+		initIconView();
+		update();
 }
@@ -1759,9 +1729,9 @@ void QtRec::okRename() {
 void QtRec::cancelRename() {
-   bool resetFocus = ListView1->viewport()->focusProxy() == renameBox;
-   delete renameBox;
-   renameBox = 0;
-   if ( resetFocus ) {
-      ListView1->viewport()->setFocusProxy( ListView1 );
-      ListView1->setFocus();
-   }
+		bool resetFocus = ListView1->viewport()->focusProxy() == renameBox;
+		delete renameBox;
+		renameBox = 0;
+		if ( resetFocus ) {
+				ListView1->viewport()->setFocusProxy( ListView1 );
+				ListView1->setFocus();
+		}
 }
@@ -1769,19 +1739,19 @@ void QtRec::cancelRename() {
 bool QtRec::eventFilter( QObject * o, QEvent * e ) {
-   if ( o->inherits( "QLineEdit" ) ) {
-      if ( e->type() == QEvent::KeyPress ) {
-         QKeyEvent *ke = (QKeyEvent*)e;
-         if ( ke->key() == Key_Return ||
-              ke->key() == Key_Enter ) {
-            okRename();
-            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 );
+		if ( o->inherits( "QLineEdit" ) ) {
+				if ( e->type() == QEvent::KeyPress ) {
+						QKeyEvent *ke = (QKeyEvent*)e;
+						if ( ke->key() == Key_Return ||
+								 ke->key() == Key_Enter ) {
+								okRename();
+								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 );
 }
@@ -1790,3 +1760,3 @@ bool QtRec::eventFilter( QObject * o, QEvent * e ) {
 int QtRec::getCurrentSizeLimit() {
-   return  sizeLimitCombo->currentItem() * 5;
+		return  sizeLimitCombo->currentItem() * 5;
 }
@@ -1794,3 +1764,3 @@ int QtRec::getCurrentSizeLimit() {
 void QtRec::timerBreak() {
-   endPlaying();
+		endPlaying();
 }
@@ -1798,7 +1768,7 @@ void QtRec::timerBreak() {
 void QtRec::doVolMuting(bool b) {
-   Config cfg( "qpe" );
-   cfg. setGroup( "Volume" );
-   cfg.writeEntry( "Mute",b);
-   cfg.write();
-   QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << b;
+		Config cfg( "qpe" );
+		cfg. setGroup( "Volume" );
+		cfg.writeEntry( "Mute",b);
+		cfg.write();
+		QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << b;
 }
@@ -1806,8 +1776,8 @@ void QtRec::doVolMuting(bool b) {
 void QtRec::doMicMuting(bool b) {
-   //  qDebug("mic mute");
-   Config cfg( "qpe" );
-   cfg. setGroup( "Volume" );
-   cfg.writeEntry( "MicMute",b);
-   cfg.write();
-   QCopEnvelope( "QPE/System", "micChange(bool)" ) << b;
+			//  qDebug("mic mute");
+		Config cfg( "qpe" );
+		cfg. setGroup( "Volume" );
+		cfg.writeEntry( "MicMute",b);
+		cfg.write();
+		QCopEnvelope( "QPE/System", "micChange(bool)" ) << b;
 }
@@ -1815,16 +1785,16 @@ void QtRec::doMicMuting(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);
-      bitRateComboBox->setCurrentItem( 0);
-      filePara.resolution = 16;
-   } else{
-      bitRateComboBox->setEnabled( true);
-   }
+		Config cfg("OpieRec");
+		cfg.setGroup("Settings");
+		cfg.writeEntry("wavCompression", b);
+		cfg.writeEntry("bitrate", 16);
+		filePara.resolution = 16;
+		cfg.write();
+
+		if(b) {
+				bitRateComboBox->setEnabled( false);
+				bitRateComboBox->setCurrentItem( 0);
+				filePara.resolution = 16;
+		} else{
+				bitRateComboBox->setEnabled( true);
+		}
 }
@@ -1833,18 +1803,18 @@ long QtRec::checkDiskSpace(const QString &path) {
 
-   struct statfs fs;
+		struct statfs fs;
 
-   if ( !statfs( path.latin1(), &fs ) ) {
+		if ( !statfs( path.latin1(), &fs ) ) {
 
-      int blkSize = fs.f_bsize;
-      int availBlks = fs.f_bavail;
+				int blkSize = fs.f_bsize;
+				int availBlks = fs.f_bavail;
 
-      long mult = blkSize / 1024;
-      long div = 1024 / blkSize;
+				long mult = blkSize / 1024;
+				long div = 1024 / blkSize;
 
-      if ( !mult ) mult = 1;
-      if ( !div ) div = 1;
+				if ( !mult ) mult = 1;
+				if ( !div ) div = 1;
 
-      return  availBlks * mult / div;
-   }
-   return -1;
+				return  availBlks * mult / div;
+		}
+		return -1;
 }
@@ -1862,3 +1832,3 @@ long QtRec::checkDiskSpace(const QString &path) {
 void QtRec::receive( const QCString &msg, const QByteArray & ) {
-   qDebug("Voicerecord received message "+msg);
+		qDebug("Voicerecord received message "+msg);
 
@@ -1868,3 +1838,3 @@ void QtRec::receive( const QCString &msg, const QByteArray & ) {
 ///////////////////////////// timerEvent
-void QtRec::timerEvent( QTimerEvent *e ) {
+void QtRec::timerEvent( QTimerEvent * ) {
 
@@ -1875,26 +1845,26 @@ void QtRec::timerEvent( QTimerEvent *e ) {
 
-   if( stopped && playing) {
-      stop();
-   }
+		if( stopped && playing) {
+				stop();
+		}
 
-   if( stopped && recording ){
-      stop();
-   }
+		if( stopped && recording ){
+				stop();
+		}
       
-   if( recording && filePara.SecondsToRecord < secCount && filePara.SecondsToRecord != 0) {
-      stop();
-   }
+		if( recording && filePara.SecondsToRecord < secCount && filePara.SecondsToRecord != 0) {
+				stop();
+		}
    
-   qDebug( "%d", secCount );
-   QString  timeString;
+		qDebug( "%d", secCount );
+		QString  timeString;
 #ifdef DEV_VERSION
-   QString msg;
-   msg.sprintf("%d, %d, %d", filePara.sampleRate, filePara.channels, filePara.resolution);
-   setCaption( msg +" ::  "+QString::number(secCount));
+		QString msg;
+		msg.sprintf("%d, %d, %d", filePara.sampleRate, filePara.channels, filePara.resolution);
+		setCaption( msg +" ::  "+QString::number(secCount));
 #endif
 
-   timeString.sprintf("%d", secCount);
-   timeLabel->setText( timeString + " seconds");
+		timeString.sprintf("%d", secCount);
+		timeLabel->setText( timeString + " seconds");
 
-   secCount++;
+		secCount++;
 }
@@ -1902,14 +1872,14 @@ void QtRec::timerEvent( QTimerEvent *e ) {
 void QtRec::changeTimeSlider(int index) {
-   if( ListView1->currentItem() == 0 || !wavFile->track.isOpen()) return;
-   //  qDebug("Slider moved to %d",index);
-   paused = true;
-   stopped = true;
+		if( ListView1->currentItem() == 0 || !wavFile->track.isOpen()) return;
+			//  qDebug("Slider moved to %d",index);
+		paused = true;
+		stopped = true;
 
-   sliderPos=index;
+		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"));
+		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"));
 }
@@ -1917,6 +1887,6 @@ void QtRec::changeTimeSlider(int index) {
 void QtRec::timeSliderPressed() {
-   if( ListView1->currentItem() == 0) return;
-   //  qDebug("slider pressed");
-   paused = true;
-   stopped = true;
+		if( ListView1->currentItem() == 0) return;
+			//  qDebug("slider pressed");
+		paused = true;
+		stopped = true;
 }
@@ -1924,12 +1894,12 @@ void QtRec::timeSliderPressed() {
 void QtRec::timeSliderReleased() {
-   if( ListView1->currentItem() == 0) return;
-   sliderPos = timeSlider->value();
+		if( ListView1->currentItem() == 0) return;
+		sliderPos = timeSlider->value();
 
-   //  qDebug("slider released %d", sliderPos);
-   stopped = false;
-   int newPos =  lseek( filePara.fd, sliderPos, SEEK_SET);
-   total =  newPos*4;
-   filePara.numberOfRecordedSeconds = (float)sliderPos / (float)filePara.sampleRate * (float)2;
+			//  qDebug("slider released %d", sliderPos);
+		stopped = false;
+		int newPos =  lseek( filePara.fd, sliderPos, SEEK_SET);
+		total =  newPos*4;
+		filePara.numberOfRecordedSeconds = (float)sliderPos / (float)filePara.sampleRate * (float)2;
 
-   doPlay();
+		doPlay();
 }
@@ -1937,15 +1907,15 @@ void QtRec::timeSliderReleased() {
 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);
-   }
+		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);
+		}
 }
@@ -1953,11 +1923,11 @@ void QtRec::rewindPressed() {
 void QtRec::rewindTimerTimeout() {
-   int  sliderValue = timeSlider->value();
-   sliderValue = sliderValue - ( filePara.numberSamples / 100);
-   //  if(toBeginningButton->isDown())
-   timeSlider->setValue( sliderValue ) ;
-   //  qDebug("%d", sliderValue);
-   QString timeString;
-   filePara.numberOfRecordedSeconds = (float)sliderValue / (float)filePara.sampleRate * (float)2;
-   timeString.sprintf( "%.2f", filePara.numberOfRecordedSeconds);
-   timeLabel->setText( timeString+ tr(" seconds"));
+		int  sliderValue = timeSlider->value();
+		sliderValue = sliderValue - ( filePara.numberSamples / 100);
+			//  if(toBeginningButton->isDown())
+		timeSlider->setValue( sliderValue ) ;
+			//  qDebug("%d", sliderValue);
+		QString timeString;
+		filePara.numberOfRecordedSeconds = (float)sliderValue / (float)filePara.sampleRate * (float)2;
+		timeString.sprintf( "%.2f", filePara.numberOfRecordedSeconds);
+		timeLabel->setText( timeString+ tr(" seconds"));
 }
@@ -1965,12 +1935,12 @@ void QtRec::rewindTimerTimeout() {
 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;
-      //    qDebug("rewind released %d", total);
-      startTimer( 1000);
-      doPlay();
-   }
+		rewindTimer->stop();
+		if( wavFile->track.isOpen()) {
+				sliderPos=timeSlider->value();
+				stopped = false;
+				int newPos =  lseek( filePara.fd, sliderPos, SEEK_SET);
+				total =  newPos * 4;
+					//    qDebug("rewind released %d", total);
+				startTimer( 1000);
+				doPlay();
+		}
 }
@@ -1978,14 +1948,14 @@ void QtRec::rewindReleased() {
 void QtRec::FastforwardPressed() {
-   if( ListView1->currentItem() == 0) return;
-   if( !wavFile->track.isOpen())
-      if( !openPlayFile() )
-         return;
-      else
-         if( !setupAudio( false))
-            return;
-   killTimers();
+		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);
+		paused = true;
+		stopped = true;
+		forwardTimer->start(50, false);
 }
@@ -1994,12 +1964,12 @@ void QtRec::FastforwardPressed() {
 void QtRec::forwardTimerTimeout() {
-   int sliderValue = timeSlider->value();
-   sliderValue = sliderValue + ( filePara.numberSamples / 100);
+		int sliderValue = timeSlider->value();
+		sliderValue = sliderValue + ( filePara.numberSamples / 100);
 
-   //  if(toEndButton->isDown())
-   timeSlider->setValue( sliderValue);
+			//  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"));
+		QString timeString;
+		filePara.numberOfRecordedSeconds = (float)sliderValue / (float)filePara.sampleRate * (float)2;
+		timeString.sprintf( "%.2f", filePara.numberOfRecordedSeconds);
+		timeLabel->setText( timeString+ tr(" seconds"));
 }
@@ -2007,12 +1977,12 @@ void QtRec::forwardTimerTimeout() {
 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();
-   }
+		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();
+		}
 }
@@ -2022,28 +1992,28 @@ QString QtRec::getStorage(const QString &fileName) {
 
-   StorageInfo storageInfo;
-   const QList<FileSystem> &fs = storageInfo.fileSystems();
-   QListIterator<FileSystem> it ( fs );
-   QString storage;
-   for( ; it.current(); ++it ){
-      const QString name = ( *it)->name();
-      const QString path = ( *it)->path();
-      const QString disk = ( *it)->disk();
-      if( fileName.find( path,0,true) != -1)
-         storage = name;
-      //        const QString options = (*it)->options();
-      //        if( name.find( tr("Internal"),0,true) == -1) {
-      //            storageComboBox->insertItem( name +" -> "+disk);
-      //    qDebug(name);
-   }
-   return storage;
-   //      struct mntent *me;
-   //  //     if(fileName == "/etc/mtab") {
-   //      FILE *mntfp = setmntent( fileName.latin1(), "r" );
-   //      if ( mntfp ) {
-   //          while ( (me = getmntent( mntfp )) != 0 ) {
-   //              QString filesystemType = me->mnt_type;
-
-   //          }
-   //      }
-   //      endmntent( mntfp );
+		StorageInfo storageInfo;
+		const QList<FileSystem> &fs = storageInfo.fileSystems();
+		QListIterator<FileSystem> it ( fs );
+		QString storage;
+		for( ; it.current(); ++it ){
+				const QString name = ( *it)->name();
+				const QString path = ( *it)->path();
+				const QString disk = ( *it)->disk();
+				if( fileName.find( path,0,true) != -1)
+						storage = name;
+					//        const QString options = (*it)->options();
+					//        if( name.find( tr("Internal"),0,true) == -1) {
+					//            storageComboBox->insertItem( name +" -> "+disk);
+					//    qDebug(name);
+		}
+		return storage;
+			//      struct mntent *me;
+			//  //     if(fileName == "/etc/mtab") {
+			//      FILE *mntfp = setmntent( fileName.latin1(), "r" );
+			//      if ( mntfp ) {
+			//          while ( (me = getmntent( mntfp )) != 0 ) {
+			//              QString filesystemType = me->mnt_type;
+
+			//          }
+			//      }
+			//      endmntent( mntfp );
 }
@@ -2052,21 +2022,21 @@ void QtRec::setRecordButton(bool b) {
 
-   if(b) { //about to record or play
+		if(b) { //about to record or play
 
-      Rec_PushButton->setDown( true);
-      QPixmap image3( ( const char** ) image3_data );
-      Stop_PushButton->setPixmap( image3 );
-      if(Stop_PushButton->isDown())
-         Stop_PushButton->setDown( true);
-      playLabel2->setText( tr("Stop") );
+				Rec_PushButton->setDown( true);
+				QPixmap image3( ( const char** ) image3_data );
+				Stop_PushButton->setPixmap( image3 );
+				if(Stop_PushButton->isDown())
+						Stop_PushButton->setDown( true);
+				playLabel2->setText( tr("Stop") );
 
-   } else { //about to stop
+		} else { //about to stop
 
-      QPixmap image4( ( const char** ) image4_data );
-      Stop_PushButton->setPixmap( image4);
-      if(Stop_PushButton->isDown())
-         Stop_PushButton->setDown( false);
-      playLabel2->setText( tr("Play") );
-      if(Rec_PushButton->isDown())
-         Rec_PushButton->setDown( false);
-   }
+				QPixmap image4( ( const char** ) image4_data );
+				Stop_PushButton->setPixmap( image4);
+				if(Stop_PushButton->isDown())
+						Stop_PushButton->setDown( false);
+				playLabel2->setText( tr("Play") );
+				if(Rec_PushButton->isDown())
+						Rec_PushButton->setDown( false);
+		}
 }
@@ -2074,21 +2044,21 @@ void QtRec::setRecordButton(bool b) {
 void QtRec::fillDirectoryCombo() {
-   if( directoryComboBox->count() > 0)
-      directoryComboBox->clear();
-   int index = 0;
-   Config cfg("OpieRec");
-   cfg.setGroup("Settings");
-   QString dir = cfg.readEntry("directory", "/");
-   StorageInfo storageInfo;
-   const QList<FileSystem> &fs = storageInfo.fileSystems();
-   QListIterator<FileSystem> it ( fs );
-   QString storage;
-   for( ; it.current(); ++it ){
-      const QString name = ( *it)->name();
-      const QString path = ( *it)->path();
-      //    directoryComboBox->insertItem(name+" "+path);
-      directoryComboBox->insertItem(name);
-      if( path == dir)
-         directoryComboBox->setCurrentItem( index);
-      index++;
-   }
+		if( directoryComboBox->count() > 0)
+				directoryComboBox->clear();
+		int index = 0;
+		Config cfg("OpieRec");
+		cfg.setGroup("Settings");
+		QString dir = cfg.readEntry("directory", "/");
+		StorageInfo storageInfo;
+		const QList<FileSystem> &fs = storageInfo.fileSystems();
+		QListIterator<FileSystem> it ( fs );
+		QString storage;
+		for( ; it.current(); ++it ){
+				const QString name = ( *it)->name();
+				const QString path = ( *it)->path();
+					//    directoryComboBox->insertItem(name+" "+path);
+				directoryComboBox->insertItem(name);
+				if( path == dir)
+						directoryComboBox->setCurrentItem( index);
+				index++;
+		}
 }
@@ -2096,5 +2066,5 @@ void QtRec::fillDirectoryCombo() {
 void QtRec::errorStop() {
-   stopped = true;
-   wavFile->closeFile();
-   killTimers();
+		stopped = true;
+		wavFile->closeFile();
+		killTimers();
 }
@@ -2102,4 +2072,4 @@ void QtRec::errorStop() {
 void QtRec::doMute(bool b) {
-   doVolMuting( b);
-   doMicMuting( b);
+		doVolMuting( b);
+		doMicMuting( b);
 }
@@ -2107,9 +2077,9 @@ void QtRec::doMute(bool b) {
 void QtRec::slotAutoMute(bool b) {
-   autoMute = b;
-   Config cfg("OpieRec");
-   cfg.setGroup("Settings");
-   cfg.writeEntry("useAutoMute",b);
-   doMute( b);
-   outMuteCheckBox->setChecked( b);
-   inMuteCheckBox->setChecked( b);
+		autoMute = b;
+		Config cfg("OpieRec");
+		cfg.setGroup("Settings");
+		cfg.writeEntry("useAutoMute",b);
+		doMute( b);
+		outMuteCheckBox->setChecked( b);
+		inMuteCheckBox->setChecked( b);
 }
@@ -2117,6 +2087,6 @@ void QtRec::slotAutoMute(bool b) {
 void QtRec::selectItemByName(const QString & name) {
-   QListViewItemIterator it( ListView1 );
-   for ( ; it.current(); ++it )
-      if( name == it.current()->text(0))
-         ListView1->setCurrentItem(it.current());
+		QListViewItemIterator it( ListView1 );
+		for ( ; it.current(); ++it )
+				if( name == it.current()->text(0))
+						ListView1->setCurrentItem(it.current());
 }
@@ -2151,12 +2121,13 @@ void QtRec::selectItemByName(const QString & name) {
 void QtRec::changeStereoCheck(bool b) {
-   Config cfg("OpieRec");
-   cfg.setGroup("Settings");
-   int ch = 0;
-   if ( !b) { ch = 1;}
-   else { ch = 2;}
-   cfg.writeEntry("stereo", b);
-   filePara.channels = ch;
+		Config cfg("OpieRec");
+		cfg.setGroup("Settings");
+		int ch = 0;
+		if ( !b) { ch = 1;}
+		else { ch = 2;}
+		cfg.writeEntry("stereo", b);
+		filePara.channels = ch;
    
-   cfg.write();
+		cfg.write();
 }
 
+		
diff --git a/noncore/multimedia/opierec/qtrec.h b/noncore/multimedia/opierec/qtrec.h
index 31cff9e..5878d37 100644
--- a/noncore/multimedia/opierec/qtrec.h
+++ b/noncore/multimedia/opierec/qtrec.h
@@ -179,5 +179,7 @@ protected:
    void showListMenu(QListViewItem * );
+#ifndef THREADED
    void quickRec();
 	 void playIt();
-  
+#endif
+	 
 };