1 files changed, 36 insertions, 32 deletions

diff --git a/core/multimedia/opieplayer/libmad/libmadplugin.cpp b/core/multimedia/opieplayer/libmad/libmadplugin.cpp
index 1989b4a..428fc28 100644
--- a/core/multimedia/opieplayer/libmad/libmadplugin.cpp
+++ b/core/multimedia/opieplayer/libmad/libmadplugin.cpp
@@ -21,2 +21,14 @@
 
+#include "libmadplugin.h"
+
+/* OPIE */
+#include <qpe/config.h>
+#include <opie2/odebug.h>
+
+/* QT */
+#include <qapplication.h>
+#include <qmessagebox.h>
+#include <qregexp.h>
+
+/* STD */
 #include <stdio.h>
@@ -36,8 +48,2 @@
 
-#include <qapplication.h>
-#include <qmessagebox.h>
-#include <qregexp.h>
-
-#include <qpe/config.h>
-
 // for network handling
@@ -56,3 +62,2 @@
 #endif
-#include "libmadplugin.h"
 
@@ -384,3 +389,3 @@ int LibMadPlugin::http_open(const QString& path ) {
         if (len == -1) {
-           //            qDebug( "http_open: "+ QString(strerror(errno)) +"\n");
+           //            odebug << "http_open: "+ QString(strerror(errno)) +"\n" << oendl;
             return 0;
@@ -398,3 +403,3 @@ int LibMadPlugin::http_open(const QString& path ) {
             if (strncmp(http_request + 4, "200 ", 4)) {
-               //                qDebug("http_open: " + QString(http_request) + "\n");
+               //                odebug << "http_open: " + QString(http_request) + "\n" << oendl;
                 return 0;
@@ -419,3 +424,3 @@ int LibMadPlugin::http_open(const QString& path ) {
 
-    //    qDebug("Stream info: " + info);
+    //    odebug << "Stream info: " + info << oendl;
 
@@ -431,3 +436,3 @@ bool LibMadPlugin::open( const QString& path ) {
     bufferSize = cfg.readNumEntry("MPeg_BufferSize",MPEG_BUFFER_SIZE);
-    //    qDebug("buffer size is %d", bufferSize);
+    //    odebug << "buffer size is " << bufferSize << "" << oendl;
     d->bad_last_frame = 0;
@@ -436,3 +441,3 @@ bool LibMadPlugin::open( const QString& path ) {
 
-    //qDebug( "Opening %s", path.latin1() );
+    //odebug << "Opening " << path << "" << oendl;
 
@@ -452,3 +457,3 @@ bool LibMadPlugin::open( const QString& path ) {
     if (d->input.fd == -1) {
-       //        qDebug("error opening %s", d->input.path );
+       //        odebug << "error opening " << d->input.path << "" << oendl;
         return FALSE;
@@ -458,3 +463,3 @@ bool LibMadPlugin::open( const QString& path ) {
     if (fstat(d->input.fd, &stat) == -1) {
-       //    qDebug("error calling fstat"); return FALSE;
+       //    odebug << "error calling fstat" << oendl;  return FALSE;
     }
@@ -470,3 +475,3 @@ bool LibMadPlugin::open( const QString& path ) {
         if (d->input.fdm == 0) {
-           //            qDebug("error mmapping file"); return FALSE;
+           //            odebug << "error mmapping file" << oendl;  return FALSE;
         }
@@ -479,3 +484,3 @@ bool LibMadPlugin::open( const QString& path ) {
         if (d->input.data == 0) {
-           //            qDebug("error allocating input buffer");
+           //            odebug << "error allocating input buffer" << oendl;
             return FALSE;
@@ -507,3 +512,3 @@ bool LibMadPlugin::close() {
         if (unmap_file(d->input.fdm, d->input.length) == -1) {
-           //            qDebug("error munmapping file");
+           //            odebug << "error munmapping file" << oendl;
             result = FALSE;
@@ -521,3 +526,3 @@ bool LibMadPlugin::close() {
     if (::close(d->input.fd) == -1) {
-       //        qDebug("error closing file %s", d->input.path);
+       //        odebug << "error closing file " << d->input.path << "" << oendl;
         result = FALSE;
@@ -547,3 +552,3 @@ int LibMadPlugin::audioChannels( int ) {
   long t; short t1[5]; audioReadSamples( t1, 2, 1, t, 0 );
-  qDebug( "LibMadPlugin::audioChannels: %i", d->frame.header.mode > 0 ? 2 : 1 );
+  odebug << "LibMadPlugin::audioChannels: " << d->frame.header.mode > 0 ? 2 : 1 << "" << oendl;
   return d->frame.header.mode > 0 ? 2 : 1;
@@ -557,3 +562,3 @@ int LibMadPlugin::audioFrequency( int ) {
     long t; short t1[5]; audioReadSamples( t1, 2, 1, t, 0 );
-    //    qDebug( "LibMadPlugin::audioFrequency: %i", d->frame.header.samplerate );
+    //    odebug << "LibMadPlugin::audioFrequency: " << d->frame.header.samplerate << "" << oendl;
     return d->frame.header.samplerate;
@@ -568,4 +573,3 @@ int LibMadPlugin::audioSamples( int ) {
 /*
-  qDebug( "LibMadPlugin::audioSamples: %i*%i", d->frame.header.duration.seconds,
-  d->frame.header.samplerate );
+  odebug << "LibMadPlugin::audioSamples: " <<  d->frame.header.duration.seconds << "*" << d->frame.header.samplerate << oendl;
   return d->frame.header.duration.seconds * d->frame.header.samplerate;
@@ -578,3 +582,3 @@ int LibMadPlugin::audioSamples( int ) {
    //           (int)d->frame.header.samplerate, (int)d->frame.header.bitrate ); 
-   //   qDebug( "LibMadPlugin::audioSamples: %i", samples );
+   //   odebug << "LibMadPlugin::audioSamples: " << samples << "" << oendl;
 
@@ -594,3 +598,3 @@ bool LibMadPlugin::audioSetSample( long, int ) {
 //     // Seek to requested position
-//     qDebug( "seek pos: %i", (int)((double)pos * d->input.fileLength / totalSamples) );
+//     odebug << "seek pos: " << (int)((double)pos * d->input.fileLength / totalSamples) << "" << oendl;
 //     ::lseek( d->input.fd, (long)((double)pos * d->input.fileLength / totalSamples), SEEK_SET );
@@ -682,3 +686,3 @@ bool LibMadPlugin::read() {
           if (len == -1) {
-             //              qDebug("error reading audio");
+             //              odebug << "error reading audio" << oendl;
               return FALSE;
@@ -760,3 +764,3 @@ bool LibMadPlugin::decode( short *output, long samples, long& samplesMade ) {
                 mad_frame_mute(&d->frame);
-                //                qDebug( "error decoding, bad crc" );
+                //                odebug << "error decoding, bad crc" << oendl;
             }
@@ -823,3 +827,3 @@ double LibMadPlugin::getTime() {
 void LibMadPlugin::printID3Tags() {
-   //    qDebug( "LibMadPlugin::printID3Tags" );
+   //    odebug << "LibMadPlugin::printID3Tags" << oendl;
 
@@ -828,3 +832,3 @@ void LibMadPlugin::printID3Tags() {
     if ( ::lseek( d->input.fd, -128, SEEK_END ) == -1 ) {
-       //        qDebug( "error seeking to id3 tags" );
+       //        odebug << "error seeking to id3 tags" << oendl;
         return;
@@ -833,3 +837,3 @@ void LibMadPlugin::printID3Tags() {
     if ( ::read( d->input.fd, id3v1, 128 ) != 128 ) {
-       //        qDebug( "error reading in id3 tags" );
+       //        odebug << "error reading in id3 tags" << oendl;
         return;
@@ -843,3 +847,3 @@ void LibMadPlugin::printID3Tags() {
         char *ptr = id3v1 + 3, *ptr2 = ptr + len[0];
-        //        qDebug( "ID3 tags in file:" );
+        //        odebug << "ID3 tags in file:" << oendl;
         info = "";
@@ -855,3 +859,3 @@ void LibMadPlugin::printID3Tags() {
             }
-//             qDebug( info.latin1() );
+//             odebug << info.latin1() << oendl;
             *ptr3 = push2;
@@ -864,3 +868,3 @@ void LibMadPlugin::printID3Tags() {
     if ( ::lseek(d->input.fd, 0, SEEK_SET) == -1 ) {
-       //        qDebug( "error seeking back to beginning" );
+       //        odebug << "error seeking back to beginning" << oendl;
         return;