4 files changed, 43 insertions, 35 deletions

diff --git a/noncore/multimedia/opierec/device.cpp b/noncore/multimedia/opierec/device.cpp
index e7e0f4b..a76665e 100644
--- a/noncore/multimedia/opierec/device.cpp
+++ b/noncore/multimedia/opierec/device.cpp
@@ -37,80 +37,83 @@
 
 #ifdef QT_QWS_DEVFS
 #define DSPSTROUT "/dev/sound/dsp"
 #define DSPSTRIN "/dev/sound/dsp"
 #define DSPSTRMIXERIN "/dev/sound/mixer"
 #define DSPSTRMIXEROUT "/dev/sound/mixer"
 #else
 #define DSPSTROUT "/dev/dsp"
 #define DSPSTRIN "/dev/dsp"
 #define DSPSTRMIXERIN "/dev/mixer"
 #define DSPSTRMIXEROUT "/dev/mixer"
 #endif
 
 #endif
 
 Device::Device( QObject * parent, bool record )
         : QObject( parent)
 {
 //    dspstr = dsp;
     devForm = -1;
     devCh = -1;
     devRate = -1;
 
     if( !record){ //playing
-        owarn << "setting up DSP for playing" << oendl;
-        flags = O_WRONLY;
+        owarn << "New Sound device DSP for playing" << oendl;
+        flags = O_RDWR;
+//        flags = O_WRONLY;
     } else { //recording
-        owarn << "setting up DSP for recording" << oendl;
+        owarn << "New Sound device DSP for recording" << oendl;
         flags = O_RDWR;
 //        flags = O_RDONLY;
                                 selectMicInput();
     }
 }
 
 bool Device::openDsp() {
+                qWarning("Device::openDsp()");
     if( openDevice( flags) == -1) {
         perror("<<<<<<<<<<<<<<ioctl(\"Open device\")");
         return false;
     }
     return true;
 }
 
 int Device::openDevice( int flags) {
-                owarn << "Opening"<< dspstr;
+                owarn << "Opening sound device:"<< DSPSTROUT << oendl;
 
-                if (( sd = ::open( DSPSTROUT, flags)) == -1) {
-                                perror("open(\"/dev/dsp\")");
+                if (( sd = ::open( DSPSTROUT, O_RDWR)) == -1) {
+                                perror("open(\"/dev/dsp\")\n");
                                 QString errorMsg="Could not open audio device\n /dev/dsp\n"
                                                 +(QString)strerror(errno);
                                 qDebug( "XXXXXXXXXXXXXXXXXXXXXXX  "+errorMsg );
                                 return -1;
                 }
 
                 if(ioctl(sd,SNDCTL_DSP_RESET,0)<0){
                                 perror("ioctl RESET");
                 }
+                qWarning("opened!");
     return sd;
 }
 
 int Device::getInVolume() {
     unsigned int volume = 0;
     Config cfg("qpe");
     cfg.setGroup("Volume");
 
     return cfg.readNumEntry("Mic");
 }
 
 int Device::getOutVolume( ) {
     unsigned int volume;
     Config cfg("qpe");
     cfg.setGroup("Volume");
 
     return cfg.readNumEntry("VolumePercent");
 }
 
 
 void Device::changedInVolume(int vol ) {
                 Config cfg("qpe");
                 cfg.setGroup("Volume");
                 cfg.writeEntry("Mic", QString::number(vol ));
@@ -129,48 +132,49 @@ void Device::changedOutVolume(int vol) {
 
 bool Device::selectMicInput() {
 
                 int md = 0;
                 int info = SOUND_MASK_MIC;//MIXER_WRITE(SOUND_MIXER_MIC);
                 owarn << "sectMicInput" << oendl;
                 md = ::open( DSPSTRMIXEROUT, O_RDWR );
 
                 if ( md <= 0) {
                                 QString err;
                                 err.sprintf("open %s", DSPSTRMIXEROUT);
                                 perror(err.latin1());
                 } else {
                                 if( ioctl( md, SOUND_MIXER_WRITE_RECSRC, &info) == -1)
                                                 perror("ioctl(\"SOUND_MIXER_WRITE_RECSRC\")");
                                 ::close(md);
                                 return false;
                 }
                 ::close(md);
 
     return true;
 }
 
 bool Device::closeDevice( bool) {
+                if(sd)
     ::close( sd); //close sound device
     return true;
 }
 
 bool Device::setDeviceFormat( int form) {
     qDebug( "set device res %d: %d ",form, sd );
     if (ioctl( sd, SNDCTL_DSP_SETFMT,  &form)==-1) { //set format
         perror("ioctl(\"SNDCTL_DSP_SETFMT\")");
         return false;
     }
     devRes=form;
     return true;
 }
 
 bool Device::setDeviceChannels( int ch) {
     qDebug( "set channels %d: %d",ch ,sd);
     if (ioctl( sd, SNDCTL_DSP_CHANNELS, &ch)==-1) {
         perror("ioctl(\"SNDCTL_DSP_CHANNELS\")");
         return false;
     }
     devCh=ch;
     return true;
 }
 
diff --git a/noncore/multimedia/opierec/opierec.pro b/noncore/multimedia/opierec/opierec.pro
index 6a5838a..6008bf7 100644
--- a/noncore/multimedia/opierec/opierec.pro
+++ b/noncore/multimedia/opierec/opierec.pro
@@ -10,29 +10,30 @@ SOURCES   = adpcm.c \
         helpwindow.cpp \
         main.cpp \
         qtrec.cpp \
         device.cpp \
         wavFile.cpp \
         waveform.cpp
 INTERFACES  =
 
 contains(CONFIG, pdaudio) {
 #  LIBS += -L/opt/buildroot-opie/output/staging/target/lib -lqpe -lpthread -ljpeg -lpng -lz
   LIBS += -L$(QPEDIR)/lib -lqpe -lpthread -ljpeg -lpng -lz -lopiecore2
   INCLUDEPATH += $(QPEDIR)/include
   DEPENDPATH  += $(QPEDIR)/include
   DEFINES += PDAUDIO
   DEFINES += THREADED
   TARGET    = qperec
 
 #  DESTDIR=$(QPEDIR)/bin
 }
 
 !contains(CONFIG, pdaudio) {
   INCLUDEPATH += $(OPIEDIR)/include
   DEPENDPATH  += $(OPIEDIR)/include
   LIBS            += -lqpe -lopiecore2 -lpthread
+  DEFINES += THREADED
   TARGET    = opierec
   include( $(OPIEDIR)/include.pro )
 }
 
 
diff --git a/noncore/multimedia/opierec/qtrec.cpp b/noncore/multimedia/opierec/qtrec.cpp
index e827083..9b761aa 100644
--- a/noncore/multimedia/opierec/qtrec.cpp
+++ b/noncore/multimedia/opierec/qtrec.cpp
@@ -135,60 +135,60 @@ void quickRec()
                                                 short sbuf2[ BUFSIZE ];
                                                 memset( abuf, 0, BUFSIZE/2);
                                                 memset( sbuf, 0, BUFSIZE);
                                                 memset( sbuf2, 0, BUFSIZE);
 
                                                 for(;;) {
                                                                 if ( stopped) {
                                                                                 odebug << "quickRec:: stopped" << oendl;
                                                                                 break;
                                                                 }
 
 //             number=::read( filePara.sd, sbuf, BUFSIZE);
                                                                 number =  soundDevice->devRead( filePara.sd, sbuf, BUFSIZE);
 
                                                                 if(number <= 0) {
                                                                                 perror("recording error ");
                                                                                 odebug << "" << filePara.fileName << " " << number << "" << oendl;
                                                                                 stopped = true;
                                                                                 return;
                                                                 }
                                                                         //if(stereo == 2) {
 //        adpcm_coder( sbuf2, abuf, number/2, &encoder_state);
                                                                 adpcm_coder( sbuf, abuf, number/2, &encoder_state);
 
-                                                                bytesWritten = ::write( filePara.fd , (short *)abuf, number/4);
+                                                                bytesWritten = ::write( filePara.fd , abuf, number/4);
 
                                                                 waveform->newSamples( sbuf, number );
 
                                                                 total += bytesWritten;
                                                                 filePara.numberSamples = total;
                                                                 timeSlider->setValue( total);
 
           printf("%d, bytes %d,total %d\r", number, bytesWritten, total);
           fflush(stdout);
 
-                                         filePara.numberOfRecordedSeconds = (float)total / (float)filePara.sampleRate * (float)2/ filePara.channels;
+                                                                        filePara.numberOfRecordedSeconds = (float)total / (float)filePara.sampleRate * (float)2;/// filePara.channels;
 
                                                                 qApp->processEvents();
                                                                 if( total >= filePara.samplesToRecord) {
                                                                                 stopped = true;
                                                                                 break;
                                                                 }
                                                 }
                                 } else {
                                                         // <<<<<<<<<<<<<<<<<<<<<<<<<<<  WAVE_FORMAT_PCM   >>>>>>>>>>>>>>>>>>>>>>
                                                 odebug << "start recording WAVE_FORMAT_PCM" << oendl;
                                                 short inbuffer[ BUFSIZE ], outbuffer[ BUFSIZE ];
                                                 memset( inbuffer, 0, BUFSIZE);
                                                 memset( outbuffer, 0, BUFSIZE);
 
                                                 for(;;) {
                                                                 if ( stopped) {
                                                                                 odebug << "quickRec:: stopped" << oendl;
                                                                                 stopped = true;
                                                                                 break;  // stop if playing was set to false
                                                                                 return;
                                                                 }
 
                                                                 number = soundDevice->devRead( soundDevice->sd /*filePara.sd*/, (short *)inbuffer, BUFSIZE);
 
@@ -280,90 +280,92 @@ void playIt()
                 int bytesWritten = 0;
                 int number = 0;
                 int total = 0;  // Total number of bytes read in so far.
                 if( filePara.resolution == 16 ) { //AFMT_S16_LE) {
                                 if( filePara.format == WAVE_FORMAT_DVI_ADPCM) {
                                                 char abuf[ BUFSIZE / 2 ];
                                                 short sbuf[ BUFSIZE ];
                                                 short sbuf2[ BUFSIZE * 2 ];
                                                 memset( abuf, 0, BUFSIZE / 2);
                                                 memset( sbuf, 0, BUFSIZE);
                                                 memset( sbuf2, 0, BUFSIZE * 2);
 // <<<<<<<<<<<<<<<<<<<<<<<<<<<  WAVE_FORMAT_DVI_ADPCM  >>>>>>>>>>>>>>>>>>>>>>
                                                 for(;;) {  // play loop
                                                                 if ( stopped) {
                                                                                 break;
                                                                                 return;
                                                                 }// stop if playing was set to false
 
                                                                 number = ::read( filePara.fd, abuf, BUFSIZE / 2);
                                                                 adpcm_decoder( abuf, sbuf, number * 2, &decoder_state);
 
 //                 for (int i=0;i< number * 2; 2 * i++) { //2*i is left channel
 //                     sbuf2[i+1]=sbuf2[i]=sbuf[i];
 //                 }
-                                                                bytesWritten = write ( filePara.sd, sbuf, number * 4);
-                                                                waveform->newSamples( (const short *)sbuf, number *4);
+                                                                bytesWritten = write ( soundDevice->sd , sbuf, number * 4);
+
+                                                                waveform->newSamples( sbuf, number );
+
                                                                         //          if(filePara.channels==1)
                                                                         //              total += bytesWritten/2; //mono
                                                                         //          else
                                                                 total += bytesWritten;
                                                                 filePara.numberSamples = total/4;
                                                                 filePara.numberOfRecordedSeconds = (float)total / (float)filePara.sampleRate / 2;
 
                                                                 timeSlider->setValue( total/4);
 //            timeString.sprintf("%.2f", filePara.numberOfRecordedSeconds);
 //         if(filePara.numberOfRecordedSeconds>1)
 //            timeLabel->setText( timeString+ tr(" seconds"));
 //                              printf("playing number %d, bytes %d, total %d\n",number,  bytesWritten, total/4);
 //                              fflush(stdout);
 
                                                                 qApp->processEvents();
 
                                                                 if( /*total >= filePara.numberSamples || */ bytesWritten == 0) {
 //            if( total >= filePara.numberSamples ){//||  secCount > filePara.numberOfRecordedSeconds ) {
                                                                                 stopped = true;
                                                                                 break;
                                                                 }
                                                 }
                                 } else {
                                                         // <<<<<<<<<<<<<<<<<<<<<<<<<<<  WAVE_FORMAT_PCM   >>>>>>>>>>>>>>>>>>>>>>
                                                 short inbuffer[ BUFSIZE ], outbuffer[ BUFSIZE ];
                                                 memset( inbuffer, 0, BUFSIZE);
                                                 memset( outbuffer, 0, BUFSIZE);
 
                                                 for(;;) {  // play loop
                                                                 if ( stopped) {
                                                                                 break;
                                                                                 return;
                                                                 }
 // stop if playing was set to false
                                                                 number = ::read( filePara.fd, inbuffer, BUFSIZE);
 //                 for (int i=0;i< number * 2; 2 * i++) { //2*i is left channel
 //                       //        for (int i=0;i< number ; i++) { //2*i is left channel
 //                     outbuffer[i+1]= outbuffer[i]=inbuffer[i];
 //                 }
-                                                                bytesWritten = ::write( filePara.sd, inbuffer, number);
+                                                                bytesWritten = ::write( soundDevice->sd, inbuffer, number);
                                                                 waveform->newSamples( inbuffer, number);
                                                                         //-------------->>>> out to device
                                                                         //        total+=bytesWritten;
                                                                         //          if(filePara.channels==1)
                                                                         //              total += bytesWritten/2; //mono
                                                                         //          else
                                                                 total += bytesWritten;
                                                                 timeSlider->setValue( total);
 
                                                                 filePara.numberSamples = total;
                                                                 filePara.numberOfRecordedSeconds = (float)total / (float)filePara.sampleRate / (float)2;
 
 //             timeString.sprintf("%.2f",filePara.numberOfRecordedSeconds);
 //             timeLabel->setText( timeString + tr(" seconds"));
 
                                                                 qApp->processEvents();
 
                                                                 if( /*total >= filePara.numberSamples || */ bytesWritten == 0) {
                                                                                 owarn << "Jane! Stop this crazy thing!" << oendl;
                                                                                 stopped = true;
 //                playing = false;
                                                                                 break;
                                                                 }
                                                 }
@@ -767,50 +769,50 @@ void QtRec::initConfig() {
                 if(i == 16)
                                 bitRateComboBox->setCurrentItem( 1);
                 else    if(i == 24)
                                 bitRateComboBox->setCurrentItem( 2);
                 else    if(i == 32)
                                 bitRateComboBox->setCurrentItem( 3);
                 else
                                 bitRateComboBox->setCurrentItem( 0);
 
                 filePara.resolution = i;
 
                 i = cfg.readNumEntry("sizeLimit", 5 );
                 QString temp;
                 sizeLimitCombo->setCurrentItem((i/5));
 
                 stereoCheckBox->setChecked( cfg.readBoolEntry("stereo", 1));
                 if( stereoCheckBox->isChecked()) {
                                 filePara.channels = 2;
                 } else {
                                 filePara.channels = 1;
                 }
 
                 compressionCheckBox->setChecked( cfg.readBoolEntry("wavCompression",1));
                 if( compressionCheckBox->isChecked()) {
+                                bitRateComboBox->setCurrentItem(1);
                                 bitRateComboBox->setEnabled(false);
-                                bitRateComboBox->setCurrentItem(0);
                                 filePara.resolution=16;
                 }
 
                 autoMuteCheckBox->setChecked( cfg.readBoolEntry("useAutoMute",0));
                 if( autoMuteCheckBox->isChecked())
                                 slotAutoMute(true);
                 else
                                 slotAutoMute(false);
 
                 Config cofg( "qpe");
                 cofg.setGroup( "Volume");
                 outMuteCheckBox->setChecked( cofg.readBoolEntry( "Mute",0));
                 inMuteCheckBox->setChecked( cofg.readBoolEntry( "MicMute",0));
 }
 
 void QtRec::stop() {
         //      owarn << "STOP" << oendl;
                 setRecordButton(false);
 
                 if( !recording)
                                 endPlaying();
                 else
                                 endRecording();
                 timeSlider->setValue(0);
@@ -1027,49 +1029,49 @@ bool QtRec::setupAudio( bool b) {
 #else
                                 if( !bitRateComboBox->isEnabled() || bitRateComboBox->currentText() == "16")
                                                 sampleformat = AFMT_S16_LE;
                                 else
                                                 sampleformat = AFMT_U8;
 
                                 if( !compressionCheckBox->isChecked()) {
                                                 filePara.format = WAVE_FORMAT_PCM;
 //          odebug << "WAVE_FORMAT_PCM" << oendl;
                                 }  else {
                                                 filePara.format = WAVE_FORMAT_DVI_ADPCM;
                                                 sampleformat = AFMT_S16_LE;
 //          odebug << "WAVE_FORMAT_DVI_ADPCM" << oendl;
                                 }
 #endif
 
                                 stereo = filePara.channels;
 //        filePara.sampleRate = sampleRateComboBox->currentText().toInt( &ok,10);//44100;
                                 flags= O_RDWR;
 //        flags= O_RDONLY;
                                 recording = true;
                 }
 
                         // if(soundDevice) delete soundDevice;
-                odebug << "<<<<<<<<<<<<<<<<<<<open dsp " << filePara.sampleRate << " " << filePara.channels << " " << sampleformat << "" << oendl;
+                owarn << "<<<<<<<<<<<<<<<<<<<open dsp " << filePara.sampleRate << " " << filePara.channels << " " << sampleformat << "" << oendl;
         //      owarn << "change waveform settings" << oendl;
                 waveform->changeSettings( filePara.sampleRate, filePara.channels );
 
                 soundDevice = new Device( this, b); //open rec
 //    soundDevice->openDsp();
                 soundDevice->reset();
 
                 odebug << "device has been made " << soundDevice->sd << "" << oendl;
 
                         //////////////////         <<<<<<<<<<<<>>>>>>>>>>>>
                 soundDevice->setDeviceFormat( sampleformat);
                 soundDevice->setDeviceChannels( filePara.channels);
                 soundDevice->setDeviceRate( filePara.sampleRate);
                 soundDevice->getDeviceFragSize();
 #ifdef QT_QWS_EBX
                 int frag = FRAGSIZE;
                 soundDevice->setFragSize( frag);
                 soundDevice->getDeviceFragSize();
 #endif
                         /////////////////
                 filePara.sd = soundDevice->sd;
 
                 if ( filePara.sd == -1) {
 
@@ -1462,49 +1464,49 @@ void QtRec::endPlaying() {
                                 doMute( true);
 
                 soundDevice->closeDevice( false);
                 soundDevice->sd = -1;
                         //  if(soundDevice) delete soundDevice;
     odebug << "file and sound device closed" << oendl;
         //      timeLabel->setText("");
                 total = 0;
                 filePara.numberSamples = 0;
                 filePara.sd = -1;
 //   wavFile->closeFile();
                 filePara.fd = 0;
 //  if(wavFile) delete wavFile; //this crashes
 
     odebug << "track closed" << oendl;
                 killTimers();
         //      owarn << "reset slider" << oendl;
                 timeSlider->setValue(0);
 
 //      if(soundDevice) delete soundDevice;
 
 }
 
 bool QtRec::openPlayFile() {
-
+                qWarning("opening file");
                 qApp->processEvents();
                 if( currentFile.isEmpty()) {
                                 QMessageBox::message(tr("Opierec"),tr("Please select file to  play"));
                                 endPlaying();
                                 return false;
                 }
                 QString currentFileName;
                 Config cfg("OpieRec");
                 cfg.setGroup("Sounds");
                 int nFiles = cfg.readNumEntry( "NumberofFiles", 0);
                 for(int i=0;i<nFiles+1;i++) { //look for file
                                 if( cfg.readEntry( QString::number(i),"").find( currentFile,0,true) != -1) {
                                                 currentFileName = cfg.readEntry( currentFile, "" );
                                                 odebug << "opening for play: " + currentFileName << oendl;
                                 }
                 }
                 wavFile = new WavFile(this,
                                                                                                         currentFileName,
                                                                                                         false);
                 filePara.fd = wavFile->wavHandle();
                 if(filePara.fd == -1) {
                                         //  if(!track.open(IO_ReadOnly)) {
                                 QString errorMsg = (QString)strerror(errno);
                                 monitoring = false;
@@ -1705,50 +1707,51 @@ void QtRec::doVolMuting(bool b) {
                 cfg. setGroup( "Volume" );
                 cfg.writeEntry( "Mute",b);
                 cfg.write();
                 QCopEnvelope( "QPE/System", "volumeChange(bool)" ) << b;
 }
 
 void QtRec::doMicMuting(bool b) {
                         //  odebug << "mic mute" << oendl;
                 Config cfg( "qpe" );
                 cfg. setGroup( "Volume" );
                 cfg.writeEntry( "MicMute",b);
                 cfg.write();
                 QCopEnvelope( "QPE/System", "micChange(bool)" ) << b;
 }
 
 void QtRec::compressionSelected(bool b) {
                 Config cfg("OpieRec");
                 cfg.setGroup("Settings");
                 cfg.writeEntry("wavCompression", b);
                 cfg.writeEntry("bitrate", 16);
                 filePara.resolution = 16;
                 cfg.write();
 
                 if(b) {
-                                bitRateComboBox->setEnabled( false);
+                                qWarning("set adpcm");
                                 bitRateComboBox->setCurrentItem( 1);
+                                bitRateComboBox->setEnabled( false);
                                 filePara.resolution = 16;
                 } else{
                                 bitRateComboBox->setEnabled( true);
                 }
 }
 
 long QtRec::checkDiskSpace(const QString &path) {
 
                 struct statfs fs;
 
                 if ( !statfs( path.latin1(), &fs ) ) {
 
                                 int blkSize = fs.f_bsize;
                                 int availBlks = fs.f_bavail;
 
                                 long mult = blkSize / 1024;
                                 long div = 1024 / blkSize;
 
                                 if ( !mult ) mult = 1;
                                 if ( !div ) div = 1;
 
                                 return  availBlks * mult / div;
                 }
                 return -1;
diff --git a/noncore/multimedia/opierec/wavFile.cpp b/noncore/multimedia/opierec/wavFile.cpp
index 80453e1..b53c416 100644
--- a/noncore/multimedia/opierec/wavFile.cpp
+++ b/noncore/multimedia/opierec/wavFile.cpp
@@ -6,49 +6,49 @@
 #include <opie2/odebug.h>
 #include <qpe/config.h>
 using namespace Opie::Core;
 
 /* QT */
 #include <qmessagebox.h>
 #include <qdir.h>
 
 /* STD */
 #include <errno.h>
 #include <sys/time.h>
 #include <sys/types.h>
 #include <sys/vfs.h>
 #include <fcntl.h>
 #include <math.h>
 #include <mntent.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 
 WavFile::WavFile( QObject * parent,const QString &fileName, bool makeNwFile, int sampleRate,
                   int channels, int resolution, int format )
         : QObject( parent)
 {
-//odebug << "new wave file" << oendl;
+                owarn << "new wave file: " << fileName << oendl;
     bool b =  makeNwFile;
     wavSampleRate=sampleRate;
     wavFormat=format;
     wavChannels=channels;
     wavResolution=resolution;
     useTmpFile=false;
     if( b) {
         newFile();
     } else {
         openFile(fileName);
     }
 }
 
 bool WavFile::newFile() {
 
 //  odebug << "Set up new file" << oendl;
   Config cfg("OpieRec");
   cfg.setGroup("Settings");
 
   currentFileName=cfg.readEntry("directory",QDir::homeDirPath());
   QString date;
   QDateTime dt = QDateTime::currentDateTime();
   date = dt.toString();//TimeString::dateString( QDateTime::currentDateTime(),false,true);
   date.replace(QRegExp("'"),"");
@@ -88,179 +88,179 @@ bool WavFile::newFile() {
   }
   if(!track.open( IO_ReadWrite | IO_Truncate)) {
     QString errorMsg=(QString)strerror(errno);
     odebug << errorMsg << oendl;
     QMessageBox::message("Note", "Error opening file.\n" +errorMsg);
 
     return false;
   } else {
     setWavHeader( track.handle() , &hdr);
   }
 return true;
 }
 
 WavFile::~WavFile() {
 
     closeFile();
 }
 
 void WavFile::closeFile() {
     if(track.isOpen())
         track.close();
 }
 
 int WavFile::openFile(const QString &currentFileName) {
-//    odebug << "open play file "+currentFileName << oendl;
+                qWarning("open play file "+currentFileName);;
     closeFile();
 
   track.setName(currentFileName);
 
   if(!track.open(IO_ReadOnly)) {
     QString errorMsg=(QString)strerror(errno);
     odebug << "<<<<<<<<<<< "+errorMsg+currentFileName << oendl;
     QMessageBox::message("Note", "Error opening file.\n" +errorMsg);
     return -1;
   } else {
     parseWavHeader( track.handle());
   }
   return track.handle();
 }
 
 bool WavFile::setWavHeader(int fd, wavhdr *hdr) {
 
   strncpy((*hdr).riffID, "RIFF", 4); // RIFF
   strncpy((*hdr).wavID, "WAVE", 4); //WAVE
   strncpy((*hdr).fmtID, "fmt ", 4); // fmt
   (*hdr).fmtLen = 16; // format length = 16
 
   if( wavFormat == WAVE_FORMAT_PCM) {
     (*hdr).fmtTag = 1; // PCM
 //    odebug << "set header  WAVE_FORMAT_PCM" << oendl;
   }
   else {
     (*hdr).fmtTag = WAVE_FORMAT_DVI_ADPCM; //intel ADPCM
  //    odebug << "set header  WAVE_FORMAT_DVI_ADPCM" << oendl;
   }
 
   //  (*hdr).nChannels = 1;//filePara.channels;// ? 2 : 1*/; // channels
   (*hdr).nChannels = wavChannels;// ? 2 : 1*/; // channels
 
   (*hdr).sampleRate = wavSampleRate; //samples per second
   (*hdr).avgBytesPerSec = (wavSampleRate)*( wavChannels*(wavResolution/8)); // bytes per second
   (*hdr).nBlockAlign = wavChannels*( wavResolution/8); //block align
   (*hdr).bitsPerSample = wavResolution; //bits per sample 8, or 16
 
   strncpy((*hdr).dataID, "data", 4);
 
   write( fd,hdr, sizeof(*hdr));
-   odebug << "writing header: bitrate " << wavResolution << ", samplerate " << wavSampleRate << ",  channels " << wavChannels << oendl;
+   owarn << "writing header: bitrate " << wavResolution << ", samplerate " << wavSampleRate << ",  channels " << wavChannels << oendl;
   return true;
 }
 
 bool WavFile::adjustHeaders(int fd, int total) {
   lseek(fd, 4, SEEK_SET);
   int i = total + 36;
   write( fd, &i, sizeof(i));
   lseek( fd, 40, SEEK_SET);
   write( fd, &total, sizeof(total));
-  odebug << "adjusting header " << total << "" << oendl;
+  owarn << "adjusting header " << total << "" << oendl;
   return true;
 }
 
 int WavFile::parseWavHeader(int fd) {
-  odebug << "Parsing wav header" << oendl;
+  owarn << "Parsing wav header" << oendl;
   char string[4];
   int found;
   short fmt;
   unsigned short ch, bitrate;
   unsigned long samplerrate, longdata;
 
   if (read(fd, string, 4) < 4) {
-    odebug << " Could not read from sound file." << oendl;
+    owarn << " Could not read from sound file." << oendl;
     return -1;
   }
   if (strncmp(string, "RIFF", 4)) {
-    odebug << " not a valid WAV file." << oendl;
+    owarn << " not a valid WAV file." << oendl;
     return -1;
   }
   lseek(fd, 4, SEEK_CUR);
   if (read(fd, string, 4) < 4) {
-    odebug << "Could not read from sound file." << oendl;
+    owarn << "Could not read from sound file." << oendl;
     return -1;
   }
   if (strncmp(string, "WAVE", 4)) {
-    odebug << "not a valid WAV file." << oendl;
+    owarn << "not a valid WAV file." << oendl;
     return -1;
   }
   found = 0;
 
   while (!found) {
     if (read(fd, string, 4) < 4) {
-      odebug << "Could not read from sound file." << oendl;
+      owarn << "Could not read from sound file." << oendl;
       return -1;
     }
     if (strncmp(string, "fmt ", 4)) {
       if (read(fd, &longdata, 4) < 4) {
-        odebug << "Could not read from sound file." << oendl;
+        owarn << "Could not read from sound file." << oendl;
         return -1;
       }
       lseek(fd, longdata, SEEK_CUR);
     } else {
       lseek(fd, 4, SEEK_CUR);
       if (read(fd, &fmt, 2) < 2) {
-        odebug << "Could not read format chunk." << oendl;
+        owarn << "Could not read format chunk." << oendl;
         return -1;
       }
       if (fmt != WAVE_FORMAT_PCM && fmt != WAVE_FORMAT_DVI_ADPCM) {
-        odebug << "Wave file contains unknown format. Unable to continue." << oendl;
+        owarn << "Wave file contains unknown format. Unable to continue." << oendl;
         return -1;
       }
       wavFormat = fmt;
       //      compressionFormat=fmt;
-      odebug << "compressionFormat is " << fmt << "" << oendl;
+      owarn << "compressionFormat is " << fmt << "" << oendl;
       if (read(fd, &ch, 2) < 2) {
-        odebug << "Could not read format chunk." << oendl;
+        owarn << "Could not read format chunk." << oendl;
         return -1;
       } else {
         wavChannels = ch;
-        odebug << "File has " << ch << " channels" << oendl;
+        owarn << "File has " << ch << " channels" << oendl;
       }
       if (read(fd, &samplerrate, 4) < 4) {
-        odebug << "Could not read from format chunk." << oendl;
+        owarn << "Could not read from format chunk." << oendl;
         return -1;
       } else {
         wavSampleRate = samplerrate;
         //                sampleRate = samplerrate;
-        odebug << "File has samplerate of " << (int) samplerrate << "" << oendl;
+        owarn << "File has samplerate of " << (int) samplerrate << "" << oendl;
       }
       lseek(fd, 6, SEEK_CUR);
       if (read(fd, &bitrate, 2) < 2) {
-        odebug << "Could not read format chunk." << oendl;
+        owarn << "Could not read format chunk." << oendl;
         return -1;
       }  else {
         wavResolution=bitrate;
         //                 resolution =  bitrate;
-        odebug << "File has bitrate of " << bitrate << "" << oendl;
+        owarn << "File has bitrate of " << bitrate << "" << oendl;
       }
       found++;
     }
   }
   found = 0;
   while (!found) {
     if (read(fd, string, 4) < 4) {
       odebug << "Could not read from sound file." << oendl;
       return -1;
     }
 
     if (strncmp(string, "data", 4)) {
       if (read(fd, &longdata, 4)<4) {
         odebug << "Could not read from sound file." << oendl;
         return -1;
       }
 
       lseek(fd, longdata, SEEK_CUR);
     } else {
       if (read(fd, &longdata, 4) < 4) {
         odebug << "Could not read from sound file." << oendl;
         return -1;
       } else {
         wavNumberSamples =  longdata;