Diffstat (limited to 'core/multimedia/opieplayer/libmad/libmadplugin.cpp') (more/less context) (ignore whitespace changes)
| -rw-r--r-- | core/multimedia/opieplayer/libmad/libmadplugin.cpp | 74 |
1 files changed, 35 insertions, 39 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 @@ -21,14 +21,2 @@ -#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> @@ -48,2 +36,8 @@ +#include <qapplication.h> +#include <qmessagebox.h> +#include <qregexp.h> + +#include <qpe/config.h> + // for network handling @@ -62,2 +56,3 @@ #endif +#include "libmadplugin.h" @@ -389,3 +384,3 @@ int LibMadPlugin::http_open(const QString& path ) { if (len == -1) { - // odebug << "http_open: "+ QString(strerror(errno)) +"\n" << oendl; + // qDebug( "http_open: "+ QString(strerror(errno)) +"\n"); return 0; @@ -403,3 +398,3 @@ int LibMadPlugin::http_open(const QString& path ) { if (strncmp(http_request + 4, "200 ", 4)) { - // odebug << "http_open: " + QString(http_request) + "\n" << oendl; + // qDebug("http_open: " + QString(http_request) + "\n"); return 0; @@ -424,3 +419,3 @@ int LibMadPlugin::http_open(const QString& path ) { - // odebug << "Stream info: " + info << oendl; + // qDebug("Stream info: " + info); @@ -436,3 +431,3 @@ bool LibMadPlugin::open( const QString& path ) { 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; @@ -441,3 +436,3 @@ bool LibMadPlugin::open( const QString& path ) { - //odebug << "Opening " << path << "" << oendl; + //qDebug( "Opening %s", path.latin1() ); @@ -457,3 +452,3 @@ bool LibMadPlugin::open( const QString& path ) { if (d->input.fd == -1) { - // odebug << "error opening " << d->input.path << "" << oendl; + // qDebug("error opening %s", d->input.path ); return FALSE; @@ -463,3 +458,3 @@ bool LibMadPlugin::open( const QString& path ) { if (fstat(d->input.fd, &stat) == -1) { - // odebug << "error calling fstat" << oendl; return FALSE; + // qDebug("error calling fstat"); return FALSE; } @@ -469,3 +464,3 @@ bool LibMadPlugin::open( const QString& path ) { d->input.fileLength = 0; - + #if defined(HAVE_MMAP) @@ -475,3 +470,3 @@ bool LibMadPlugin::open( const QString& path ) { if (d->input.fdm == 0) { - // odebug << "error mmapping file" << oendl; return FALSE; + // qDebug("error mmapping file"); return FALSE; } @@ -484,3 +479,3 @@ bool LibMadPlugin::open( const QString& path ) { if (d->input.data == 0) { - // odebug << "error allocating input buffer" << oendl; + // qDebug("error allocating input buffer"); return FALSE; @@ -512,3 +507,3 @@ bool LibMadPlugin::close() { if (unmap_file(d->input.fdm, d->input.length) == -1) { - // odebug << "error munmapping file" << oendl; + // qDebug("error munmapping file"); result = FALSE; @@ -526,3 +521,3 @@ 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; @@ -552,3 +547,3 @@ int LibMadPlugin::audioChannels( int ) { 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; @@ -562,3 +557,3 @@ int LibMadPlugin::audioFrequency( int ) { 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; @@ -573,3 +568,4 @@ int LibMadPlugin::audioSamples( int ) { /* - 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; @@ -580,5 +576,5 @@ int LibMadPlugin::audioSamples( int ) { - // 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 ); @@ -598,3 +594,3 @@ bool LibMadPlugin::audioSetSample( long, int ) { // // 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 ); @@ -686,3 +682,3 @@ bool LibMadPlugin::read() { if (len == -1) { - // odebug << "error reading audio" << oendl; + // qDebug("error reading audio"); return FALSE; @@ -764,3 +760,3 @@ bool LibMadPlugin::decode( short *output, long samples, long& samplesMade ) { mad_frame_mute(&d->frame); - // odebug << "error decoding, bad crc" << oendl; + // qDebug( "error decoding, bad crc" ); } @@ -827,3 +823,3 @@ double LibMadPlugin::getTime() { void LibMadPlugin::printID3Tags() { - // odebug << "LibMadPlugin::printID3Tags" << oendl; + // qDebug( "LibMadPlugin::printID3Tags" ); @@ -832,3 +828,3 @@ void LibMadPlugin::printID3Tags() { if ( ::lseek( d->input.fd, -128, SEEK_END ) == -1 ) { - // odebug << "error seeking to id3 tags" << oendl; + // qDebug( "error seeking to id3 tags" ); return; @@ -837,3 +833,3 @@ void LibMadPlugin::printID3Tags() { if ( ::read( d->input.fd, id3v1, 128 ) != 128 ) { - // odebug << "error reading in id3 tags" << oendl; + // qDebug( "error reading in id3 tags" ); return; @@ -847,3 +843,3 @@ void LibMadPlugin::printID3Tags() { char *ptr = id3v1 + 3, *ptr2 = ptr + len[0]; - // odebug << "ID3 tags in file:" << oendl; + // qDebug( "ID3 tags in file:" ); info = ""; @@ -859,3 +855,3 @@ void LibMadPlugin::printID3Tags() { } -// odebug << info.latin1() << oendl; +// qDebug( info.latin1() ); *ptr3 = push2; @@ -868,3 +864,3 @@ 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; |