1 files changed, 34 insertions, 38 deletions

diff --git a/core/multimedia/opieplayer/libmad/libmadplugin.cpp b/core/multimedia/opieplayer/libmad/libmadplugin.cpp
index 7438a45..1989b4a 100644
--- a/core/multimedia/opieplayer/libmad/libmadplugin.cpp
+++ b/core/multimedia/opieplayer/libmad/libmadplugin.cpp
@@ -19,18 +19,6 @@
 **********************************************************************/
 // largly modified by Maximilian Reiss <max.reiss@gmx.de>
 
-#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>
 #include <stdarg.h>
 #include <stdlib.h>
@@ -46,6 +34,12 @@
 #include <math.h>
 #include <assert.h>
 
+#include <qapplication.h>
+#include <qmessagebox.h>
+#include <qregexp.h>
+
+#include <qpe/config.h>
+
 // for network handling
 #include <netinet/in.h>
 #include <netdb.h>
@@ -60,6 +54,7 @@
 #if defined(HAVE_MMAP)
 #   include <sys/mman.h>
 #endif
+#include "libmadplugin.h"
 
 
 extern "C" {
@@ -387,7 +382,7 @@ int LibMadPlugin::http_open(const QString& path ) {
         len = http_read_line(tcp_sock, http_request, sizeof(http_request));
 
         if (len == -1) {
-           //            odebug << "http_open: "+ QString(strerror(errno)) +"\n" << oendl;
+           //            qDebug( "http_open: "+ QString(strerror(errno)) +"\n");
             return 0;
         }
 
@@ -401,7 +396,7 @@ int LibMadPlugin::http_open(const QString& path ) {
         if (QString(http_request).left(4) == "ICY ") {
             /* This is shoutcast/icecast streaming */
             if (strncmp(http_request + 4, "200 ", 4)) {
-               //                odebug << "http_open: " + QString(http_request) + "\n" << oendl;
+               //                qDebug("http_open: " + QString(http_request) + "\n");
                 return 0;
             }
         } else if (QString(http_request).left(4) == "icy-") {
@@ -422,7 +417,7 @@ int LibMadPlugin::http_open(const QString& path ) {
 
     info = QString(name + genre + url + bitrate + message).replace( QRegExp("\n"), " : " );
 
-    //    odebug << "Stream info: " + info << oendl;
+    //    qDebug("Stream info: " + info);
 
     return (tcp_sock);
 }
@@ -434,12 +429,12 @@ bool LibMadPlugin::open( const QString& path ) {
     Config cfg("OpiePlayer");
     cfg.setGroup("Options");
     bufferSize = cfg.readNumEntry("MPeg_BufferSize",MPEG_BUFFER_SIZE);
-    //    odebug << "buffer size is " << bufferSize << "" << oendl;
+    //    qDebug("buffer size is %d", bufferSize);
     d->bad_last_frame = 0;
     d->flush = TRUE;
     info = QString( "" );
 
-    //odebug << "Opening " << path << "" << oendl;
+    //qDebug( "Opening %s", path.latin1() );
 
     if (path.left( 4 ) == "http" ) {
         // in case of any error we get 0 here
@@ -455,13 +450,13 @@ bool LibMadPlugin::open( const QString& path ) {
         printID3Tags();
     }
     if (d->input.fd == -1) {
-       //        odebug << "error opening " << d->input.path << "" << oendl;
+       //        qDebug("error opening %s", d->input.path );
         return FALSE;
     }
 
     struct stat stat;
     if (fstat(d->input.fd, &stat) == -1) {
-       //    odebug << "error calling fstat" << oendl;  return FALSE;
+       //    qDebug("error calling fstat"); return FALSE;
     }
     if (S_ISREG(stat.st_mode) && stat.st_size > 0)
   d->input.fileLength = stat.st_size;
@@ -473,7 +468,7 @@ bool LibMadPlugin::open( const QString& path ) {
         d->input.length = stat.st_size;
         d->input.fdm = map_file(d->input.fd, &d->input.length);
         if (d->input.fdm == 0) {
-           //            odebug << "error mmapping file" << oendl;  return FALSE;
+           //            qDebug("error mmapping file"); return FALSE;
         }
         d->input.data = (unsigned char *)d->input.fdm;
     }
@@ -482,7 +477,7 @@ bool LibMadPlugin::open( const QString& path ) {
     if (d->input.data == 0) {
         d->input.data = (unsigned char *)malloc( bufferSize /*MPEG_BUFFER_SIZE*/);
         if (d->input.data == 0) {
-           //            odebug << "error allocating input buffer" << oendl;
+           //            qDebug("error allocating input buffer");
             return FALSE;
         }
         d->input.length = 0;
@@ -510,7 +505,7 @@ bool LibMadPlugin::close() {
 #if defined(HAVE_MMAP)
     if (d->input.fdm) {
         if (unmap_file(d->input.fdm, d->input.length) == -1) {
-           //            odebug << "error munmapping file" << oendl;
+           //            qDebug("error munmapping file");
             result = FALSE;
         }
         d->input.fdm  = 0;
@@ -524,7 +519,7 @@ bool LibMadPlugin::close() {
     }
 
     if (::close(d->input.fd) == -1) {
-       //        odebug << "error closing file " << d->input.path << "" << oendl;
+       //        qDebug("error closing file %s", d->input.path);
         result = FALSE;
     }
 
@@ -550,7 +545,7 @@ int LibMadPlugin::audioChannels( int ) {
     debugMsg( "LibMadPlugin::audioChannels" );
 /*
   long t; short t1[5]; audioReadSamples( t1, 2, 1, t, 0 );
-  odebug << "LibMadPlugin::audioChannels: " << d->frame.header.mode > 0 ? 2 : 1 << "" << oendl;
+  qDebug( "LibMadPlugin::audioChannels: %i", d->frame.header.mode > 0 ? 2 : 1 );
   return d->frame.header.mode > 0 ? 2 : 1;
 */
     return 2;
@@ -560,7 +555,7 @@ int LibMadPlugin::audioChannels( int ) {
 int LibMadPlugin::audioFrequency( int ) {
     debugMsg( "LibMadPlugin::audioFrequency" );
     long t; short t1[5]; audioReadSamples( t1, 2, 1, t, 0 );
-    //    odebug << "LibMadPlugin::audioFrequency: " << d->frame.header.samplerate << "" << oendl;
+    //    qDebug( "LibMadPlugin::audioFrequency: %i", d->frame.header.samplerate );
     return d->frame.header.samplerate;
 }
 
@@ -571,16 +566,17 @@ int LibMadPlugin::audioSamples( int ) {
    long t; short t1[5]; audioReadSamples( t1, 2, 1, t, 0 );
    mad_header_decode( (struct mad_header *)&d->frame.header, &d->stream );
 /*
-  odebug << "LibMadPlugin::audioSamples: " <<  d->frame.header.duration.seconds << "*" << d->frame.header.samplerate << oendl;
+  qDebug( "LibMadPlugin::audioSamples: %i*%i", d->frame.header.duration.seconds,
+  d->frame.header.samplerate );
   return d->frame.header.duration.seconds * d->frame.header.samplerate;
 */
    if ( d->frame.header.bitrate == 0 )
       return 0;
    int samples = (d->input.fileLength / (d->frame.header.bitrate/8)) * d->frame.header.samplerate;
 
-   //   odebug << "LibMadPlugin::audioSamples: " << (int)d->input.fileLength
-   //          << " * " << (int)d->frame.header.samplerate << " * 8 / " << (int)d->frame.header.bitrate << oendl;
-   //   odebug << "LibMadPlugin::audioSamples: " << samples << "" << oendl;
+   //   qDebug( "LibMadPlugin::audioSamples: %i * %i * 8 / %i", (int)d->input.fileLength,
+   //           (int)d->frame.header.samplerate, (int)d->frame.header.bitrate ); 
+   //   qDebug( "LibMadPlugin::audioSamples: %i", samples );
 
    return samples;
 
@@ -596,7 +592,7 @@ bool LibMadPlugin::audioSetSample( long, int ) {
 //   return FALSE;
 
 //     // Seek to requested position
-//     odebug << "seek pos: " << (int)((double)pos * d->input.fileLength / totalSamples) << "" << oendl;
+//     qDebug( "seek pos: %i", (int)((double)pos * d->input.fileLength / totalSamples) );
 //     ::lseek( d->input.fd, (long)((double)pos * d->input.fileLength / totalSamples), SEEK_SET );
 //     mad_stream_sync(&d->stream);
 
@@ -684,7 +680,7 @@ bool LibMadPlugin::read() {
           while (len == -1 && errno == EINTR);
 
           if (len == -1) {
-             //              odebug << "error reading audio" << oendl;
+             //              qDebug("error reading audio");
               return FALSE;
           }
           else if (len == 0) {
@@ -762,7 +758,7 @@ bool LibMadPlugin::decode( short *output, long samples, long& samplesMade ) {
             }
             if ( d->stream.error == MAD_ERROR_BADCRC ) {
                 mad_frame_mute(&d->frame);
-                //                odebug << "error decoding, bad crc" << oendl;
+                //                qDebug( "error decoding, bad crc" );
             }
         }
 
@@ -825,17 +821,17 @@ double LibMadPlugin::getTime() {
 
 
 void LibMadPlugin::printID3Tags() {
-   //    odebug << "LibMadPlugin::printID3Tags" << oendl;
+   //    qDebug( "LibMadPlugin::printID3Tags" );
 
     char id3v1[128 + 1];
 
     if ( ::lseek( d->input.fd, -128, SEEK_END ) == -1 ) {
-       //        odebug << "error seeking to id3 tags" << oendl;
+       //        qDebug( "error seeking to id3 tags" );
         return;
     }
 
     if ( ::read( d->input.fd, id3v1, 128 ) != 128 ) {
-       //        odebug << "error reading in id3 tags" << oendl;
+       //        qDebug( "error reading in id3 tags" );
         return;
     }
 
@@ -845,7 +841,7 @@ void LibMadPlugin::printID3Tags() {
         int len[5] = { 30, 30, 30, 4, 30 };
         QString label[5] = { tr( "Title" ), tr( "Artist" ), tr( "Album" ), tr( "Year" ), tr( "Comment" ) };
         char *ptr = id3v1 + 3, *ptr2 = ptr + len[0];
-        //        odebug << "ID3 tags in file:" << oendl;
+        //        qDebug( "ID3 tags in file:" );
         info = "";
         for ( int i = 0; i < 5; ptr += len[i], i++, ptr2 += len[i] ) {
             char push = *ptr2;
@@ -857,7 +853,7 @@ void LibMadPlugin::printID3Tags() {
                 if( ((QString)ptr).find("  ") == -1) // don't add anything that has blanks
                 info += ( i != 0 ? ", " : "" ) + label[i] + ": " + ptr;
             }
-//             odebug << info.latin1() << oendl;
+//             qDebug( info.latin1() );
             *ptr3 = push2;
             *ptr2 = push;
         }
@@ -866,7 +862,7 @@ void LibMadPlugin::printID3Tags() {
     }
 
     if ( ::lseek(d->input.fd, 0, SEEK_SET) == -1 ) {
-       //        odebug << "error seeking back to beginning" << oendl;
+       //        qDebug( "error seeking back to beginning" );
         return;
     }
 }