convert to Opie Debugging Framework

1 files changed, 35 insertions, 32 deletions

diff --git a/noncore/multimedia/opierec/wavFile.cpp b/noncore/multimedia/opierec/wavFile.cpp
index 35bc14d..7e9b50f 100644
--- a/noncore/multimedia/opierec/wavFile.cpp
+++ b/noncore/multimedia/opierec/wavFile.cpp
@@ -1,33 +1,36 @@
 //wavFile.cpp
 #include "wavFile.h"
 #include "qtrec.h"
 
+/* OPIE */
+#include <opie2/odebug.h>
+#include <qpe/config.h>
+using namespace Opie::Core;
+
+/* QT */
 #include <qmessagebox.h>
 #include <qdir.h>
 
-#include <qpe/config.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)
 {
-//qDebug("new wave file");
+//odebug << "new wave file" << oendl; 
     bool b =  makeNwFile;
     wavSampleRate=sampleRate;
     wavFormat=format;
     wavChannels=channels;
     wavResolution=resolution;
     useTmpFile=false;
@@ -37,13 +40,13 @@ WavFile::WavFile( QObject * parent,const QString &fileName, bool makeNwFile, int
         openFile(fileName);
     }
 }
 
 bool WavFile::newFile() {
 
-//  qDebug("Set up new file");
+//  odebug << "Set up new file" << oendl; 
   Config cfg("OpieRec");
   cfg.setGroup("Settings");
 
   currentFileName=cfg.readEntry("directory",QDir::homeDirPath());
   QString date;
   QDateTime dt = QDateTime::currentDateTime();
@@ -57,13 +60,13 @@ bool WavFile::newFile() {
   if(currentFileName.right(1).find("/",0,true) == -1)
     currentFileName += "/" + date;
   else
     currentFileName += date;
   currentFileName+=".wav";
 
-//  qDebug("set up file for recording: "+currentFileName);
+//  odebug << "set up file for recording: "+currentFileName << oendl; 
   char pointer[] = "/tmp/opierec-XXXXXX";
   int fd = 0;
 
   if( currentFileName.find("/mnt",0,true) == -1
       && currentFileName.find("/tmp",0,true) == -1 ) {
     // if destination file is most likely in flash (assuming jffs2)
@@ -72,23 +75,23 @@ bool WavFile::newFile() {
     useTmpFile = true;
     if(( fd = mkstemp( pointer)) < 0 ) {
        perror("mkstemp failed");
        return false;
     }
     
-//    qDebug("Opening tmp file %s",pointer);
+//    odebug << "Opening tmp file " << pointer << "" << oendl; 
     track.setName( pointer);
 
   } else { //just use regular file.. no moving
       
     useTmpFile = false;
     track.setName( currentFileName);
   }
   if(!track.open( IO_ReadWrite | IO_Truncate)) {
     QString errorMsg=(QString)strerror(errno);
-    qDebug(errorMsg);
+    odebug << errorMsg << oendl; 
     QMessageBox::message("Note", "Error opening file.\n" +errorMsg);
   
     return false;
   } else {
     setWavHeader( track.handle() , &hdr);
   }
@@ -103,20 +106,20 @@ WavFile::~WavFile() {
 void WavFile::closeFile() {
     if(track.isOpen()) 
         track.close();
 }
 
 int WavFile::openFile(const QString &currentFileName) {
-//    qDebug("open play file "+currentFileName);
+//    odebug << "open play file "+currentFileName << oendl; 
     closeFile();
     
   track.setName(currentFileName);
 
   if(!track.open(IO_ReadOnly)) {
     QString errorMsg=(QString)strerror(errno);
-    qDebug("<<<<<<<<<<< "+errorMsg+currentFileName);
+    odebug << "<<<<<<<<<<< "+errorMsg+currentFileName << oendl; 
     QMessageBox::message("Note", "Error opening file.\n" +errorMsg);
     return -1;
   } else {
     parseWavHeader( track.handle());
   }
   return track.handle();
@@ -128,17 +131,17 @@ bool WavFile::setWavHeader(int fd, wavhdr *hdr) {
   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
-//    qDebug("set header  WAVE_FORMAT_PCM");
+//    odebug << "set header  WAVE_FORMAT_PCM" << oendl; 
   }
   else {
     (*hdr).fmtTag = WAVE_FORMAT_DVI_ADPCM; //intel ADPCM
- //    qDebug("set header  WAVE_FORMAT_DVI_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
@@ -157,112 +160,112 @@ bool WavFile::setWavHeader(int fd, wavhdr *hdr) {
 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));
-  qDebug("adjusting header %d", total);
+  odebug << "adjusting header " << total << "" << oendl; 
   return true;
 }
 
 int WavFile::parseWavHeader(int fd) {
-  qDebug("Parsing wav header");
+  odebug << "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) {
-    qDebug(" Could not read from sound file.\n");
+    odebug << " Could not read from sound file.\n" << oendl; 
     return -1;
   }
   if (strncmp(string, "RIFF", 4)) {
-    qDebug(" not a valid WAV file.\n");
+    odebug << " not a valid WAV file.\n" << oendl; 
     return -1;
   }
   lseek(fd, 4, SEEK_CUR);
   if (read(fd, string, 4) < 4) {
-    qDebug("Could not read from sound file.\n");
+    odebug << "Could not read from sound file.\n" << oendl; 
     return -1;
   }
   if (strncmp(string, "WAVE", 4)) {
-    qDebug("not a valid WAV file.\n");
+    odebug << "not a valid WAV file.\n" << oendl; 
     return -1;
   }
   found = 0;
 
   while (!found) {
     if (read(fd, string, 4) < 4) {
-      qDebug("Could not read from sound file.\n");
+      odebug << "Could not read from sound file.\n" << oendl; 
       return -1;
     }
     if (strncmp(string, "fmt ", 4)) {
       if (read(fd, &longdata, 4) < 4) {
-        qDebug("Could not read from sound file.\n");
+        odebug << "Could not read from sound file.\n" << oendl; 
         return -1;
       }
       lseek(fd, longdata, SEEK_CUR);
     } else {
       lseek(fd, 4, SEEK_CUR);
       if (read(fd, &fmt, 2) < 2) {
-        qDebug("Could not read format chunk.\n");
+        odebug << "Could not read format chunk.\n" << oendl; 
         return -1;
       }
       if (fmt != WAVE_FORMAT_PCM && fmt != WAVE_FORMAT_DVI_ADPCM) {
         qDebug("Wave file contains unknown format."
                " Unable to continue.\n");
         return -1;
       }
       wavFormat = fmt;
       //      compressionFormat=fmt;
-      qDebug("compressionFormat is %d", fmt);
+      odebug << "compressionFormat is " << fmt << "" << oendl; 
       if (read(fd, &ch, 2) < 2) {
-        qDebug("Could not read format chunk.\n");
+        odebug << "Could not read format chunk.\n" << oendl; 
         return -1;
       } else {
         wavChannels = ch;
-        qDebug("File has %d channels", ch);
+        odebug << "File has " << ch << " channels" << oendl; 
       }
       if (read(fd, &samplerrate, 4) < 4) {
-        qDebug("Could not read from format chunk.\n");
+        odebug << "Could not read from format chunk.\n" << oendl; 
         return -1;
       } else {
         wavSampleRate = samplerrate;
         //                sampleRate = samplerrate;
-        qDebug("File has samplerate of %d",(int) samplerrate);
+        odebug << "File has samplerate of " << (int) samplerrate << "" << oendl; 
       }
       lseek(fd, 6, SEEK_CUR);
       if (read(fd, &bitrate, 2) < 2) {
-        qDebug("Could not read format chunk.\n");
+        odebug << "Could not read format chunk.\n" << oendl; 
         return -1;
       }  else {
         wavResolution=bitrate;
         //                 resolution =  bitrate;
-        qDebug("File has bitrate of %d", bitrate);
+        odebug << "File has bitrate of " << bitrate << "" << oendl; 
       }
       found++;
     }
   }
   found = 0;
   while (!found) {
     if (read(fd, string, 4) < 4) {
-      qDebug("Could not read from sound file.\n");
+      odebug << "Could not read from sound file.\n" << oendl; 
       return -1;
     }
 
     if (strncmp(string, "data", 4)) {
       if (read(fd, &longdata, 4)<4) {
-        qDebug("Could not read from sound file.\n");
+        odebug << "Could not read from sound file.\n" << oendl; 
         return -1;
       }
 
       lseek(fd, longdata, SEEK_CUR);
     } else {
       if (read(fd, &longdata, 4) < 4) {
-        qDebug("Could not read from sound file.\n");
+        odebug << "Could not read from sound file.\n" << oendl; 
         return -1;
       } else {
         wavNumberSamples =  longdata;
          qDebug("file has length of %d \nlasting %d seconds", (int)longdata,
         (int)(( longdata / wavSampleRate) / wavChannels) / ( wavChannels*( wavResolution/8)) );
 //        wavSeconds = (( longdata / wavSampleRate) / wavChannels) / ( wavChannels*( wavResolution/8));