1 files changed, 31 insertions, 31 deletions

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();
+                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;