- convert qDebug to odebug

2 files changed, 16 insertions, 16 deletions

diff --git a/noncore/multimedia/opierec/qtrec.cpp b/noncore/multimedia/opierec/qtrec.cpp
index 6eb6524..3b8cb0d 100644
--- a/noncore/multimedia/opierec/qtrec.cpp
+++ b/noncore/multimedia/opierec/qtrec.cpp
@@ -118,16 +118,15 @@ Device *soundDevice;
 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);
+        odebug << ( filePara.numberSamples/filePara.sampleRate * filePara.channels ) << oendl;
+        odebug << "samples " << filePara.numberSamples << ", rate " << filePara.sampleRate
+               << ", channels " << filePara.channels << oendl;
 
                 int total = 0;  // Total number of bytes read in so far.
                 int bytesWritten, number;
 
                 bytesWritten = 0;
                 number = 0;
@@ -916,16 +915,15 @@ bool QtRec::rec() { //record
 
                                 if( setupAudio( true))
                                                 if(setUpFile())  {
                                                                 int fileSize = 0;
                                                                 Config cfg("OpieRec");
                                                                 cfg.setGroup("Settings");
-//             qDebug( "<<<<<<<Device bits %d, device rate %d, device channels %d",
-//                     soundDevice->getDeviceBits(),
-//                     soundDevice->getDeviceRate(),
-//                     soundDevice->getDeviceChannels());
+//             odebug << "<<<<<<<Device bits " << soundDevice->getDeviceBits()
+//                    << ", device rate " << soundDevice->getDeviceRate()
+//                    << ", device channels " << soundDevice->getDeviceChannels() << oendl;
 
                                                                         //filePara.sampleRate = cfg.readNumEntry("samplerate", 22050);
 //             odebug << "sample rate is " << filePara.sampleRate << "" << oendl;
                                                                 filePara.SecondsToRecord = getCurrentSizeLimit();
 
 //             odebug << "size limit " << filePara.SecondsToRecord << " sec" << oendl;
@@ -941,14 +939,14 @@ bool QtRec::rec() { //record
 //                odebug << "WAVE_FORMAT_DVI_ADPCM" << oendl;
                                                                                 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);
+                                odebug << "filesize should be " << filePara.samplesToRecord
+                                       << ", bits " << filePara.resolution << ", rate " << filePara.sampleRate;
                                                                 if( paused) {
                                                                                 paused = false;
                                                                 }
                                                                         //                  else {
                                                                 odebug << "Setting timeslider " << filePara.samplesToRecord << "" << oendl;
                                                                         //           if(fileSize != 0)
diff --git a/noncore/multimedia/opierec/wavFile.cpp b/noncore/multimedia/opierec/wavFile.cpp
index 7e9b50f..fc0130c 100644
--- a/noncore/multimedia/opierec/wavFile.cpp
+++ b/noncore/multimedia/opierec/wavFile.cpp
@@ -149,14 +149,15 @@ bool WavFile::setWavHeader(int fd, wavhdr *hdr) {
   (*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));
-   qDebug("writing header: bitrate%d, samplerate %d,  channels %d",
-          wavResolution, wavSampleRate, wavChannels);
+   odebug << "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;
@@ -209,14 +210,13 @@ int WavFile::parseWavHeader(int fd) {
       lseek(fd, 4, SEEK_CUR);
       if (read(fd, &fmt, 2) < 2) {
         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");
+        odebug << "Wave file contains unknown format. Unable to continue.\n" << oendl;
         return -1;
       }
       wavFormat = fmt;
       //      compressionFormat=fmt;
       odebug << "compressionFormat is " << fmt << "" << oendl; 
       if (read(fd, &ch, 2) < 2) {
@@ -263,14 +263,16 @@ int WavFile::parseWavHeader(int fd) {
     } else {
       if (read(fd, &longdata, 4) < 4) {
         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)) );
+         odebug << "file hase length of " << (int)longdata << "\n"
+                << "lasting "
+                << (int)(( longdata / wavSampleRate) / wavChannels) / ( wavChannels*( wavResolution/8))
+                << " seconds" << oendl;
 //        wavSeconds = (( longdata / wavSampleRate) / wavChannels) / ( wavChannels*( wavResolution/8));
         
   return longdata;
       }
     }
   }