author | ar <ar> | 2004-05-02 17:04:41 (UTC) |
---|---|---|
committer | ar <ar> | 2004-05-02 17:04:41 (UTC) |
commit | 4d3379027557e251201b531896974a69ae4c665a (patch) (side-by-side diff) | |
tree | 6e813be1aa29131f8f8e91f532f38f8a381e38f4 /core/multimedia/opieplayer/vorbis/libtremorplugin.cpp | |
parent | f8add41b2e0b0371754521b44d95f87fa70a6ff2 (diff) | |
download | opie-4d3379027557e251201b531896974a69ae4c665a.zip opie-4d3379027557e251201b531896974a69ae4c665a.tar.gz opie-4d3379027557e251201b531896974a69ae4c665a.tar.bz2 |
- convert qDebug to odebug
Diffstat (limited to 'core/multimedia/opieplayer/vorbis/libtremorplugin.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | core/multimedia/opieplayer/vorbis/libtremorplugin.cpp | 31 |
1 files changed, 18 insertions, 13 deletions
diff --git a/core/multimedia/opieplayer/vorbis/libtremorplugin.cpp b/core/multimedia/opieplayer/vorbis/libtremorplugin.cpp index 53c4b2b..0002213 100644 --- a/core/multimedia/opieplayer/vorbis/libtremorplugin.cpp +++ b/core/multimedia/opieplayer/vorbis/libtremorplugin.cpp @@ -18,8 +18,17 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ****************************************************************************/ // fixed and adapted for opieplayer 2003 ljp <llornkcor@handhelds.org> +#include "libtremorplugin.h" + +/* OPIE */ +#include <opie2/odebug.h> + +/* QT */ +#include <qmap.h> + +/* STD */ #include <stdio.h> #include <stdarg.h> #include <stdlib.h> #include <sys/types.h> @@ -32,12 +41,8 @@ #include <locale.h> #include <math.h> #include <assert.h> -#include <qmap.h> - -#include "libtremorplugin.h" - extern "C" { #include "tremor/ivorbisfile.h" } @@ -61,9 +66,9 @@ public: }; LibTremorPlugin::LibTremorPlugin() { -qDebug("<<<<<<<<<<<<<TREMOR!!!!!>>>>>>>>>>>>>>>>>>"); +odebug << "<<<<<<<<<<<<<TREMOR!!!!!>>>>>>>>>>>>>>>>>>" << oendl; d = new LibTremorPluginData; d->f = 0; d->vi = 0; d->vc = 0; @@ -104,14 +109,14 @@ bool LibTremorPlugin::open( const QString& path ) { d->filename = (char*) path.latin1(); d->f = fopen( d->filename, "r" ); if (d->f == 0) { - qDebug("error opening %s", d->filename ); + odebug << "error opening " << d->filename << "" << oendl; return FALSE; } if (ov_open(d->f, &d->vf, NULL, 0) < 0) { - qDebug("error opening %s", d->filename); + odebug << "error opening " << d->filename << "" << oendl; return FALSE; } d->vc = ov_comment(&d->vf, -1); @@ -152,9 +157,9 @@ bool LibTremorPlugin::open( const QString& path ) { d->finfo += cdescr[i] + ": " + v; } } - qDebug("finfo: " + d->finfo); + odebug << "finfo: " + d->finfo << oendl; return TRUE; } @@ -164,9 +169,9 @@ bool LibTremorPlugin::close() { int result = TRUE; if (fclose(d->f) == -1) { - qDebug("error closing file %s", d->filename); + odebug << "error closing file " << d->filename << "" << oendl; result = FALSE; } d->f = 0; @@ -192,15 +197,15 @@ int LibTremorPlugin::audioStreams() { } int LibTremorPlugin::audioChannels( int ) { - qDebug( "LibTremorPlugin::audioChannels: %i", d->vi->channels ); + odebug << "LibTremorPlugin::audioChannels: " << d->vi->channels << "" << oendl; return d->vi->channels; } int LibTremorPlugin::audioFrequency( int ) { - qDebug( "LibTremorPlugin::audioFrequency: %ld", d->vi->rate ); + odebug << "LibTremorPlugin::audioFrequency: " << d->vi->rate << "" << oendl; return d->vi->rate; } @@ -222,9 +227,9 @@ long LibTremorPlugin::audioGetSample( int ) { } bool LibTremorPlugin::audioReadSamples( short *output, int, long samples, long& samplesMade, int ) { -// qDebug( "<<<<<<<<<<<<LibTremorPlugin::audioReadStereoSamples %d", samples ); +// odebug << "<<<<<<<<<<<<LibTremorPlugin::audioReadStereoSamples " << samples << "" << oendl; int old_section = d->csection; char* buf = (char*) output; @@ -244,9 +249,9 @@ bool LibTremorPlugin::audioReadSamples( short *output, int, long samples, long& n = length; } long ret = ov_read(&d->vf, buf, n, &d->csection); -// qDebug("%d", ret); +// odebug << "" << ret << "" << oendl; if (ret == 0) { break; } else if (ret < 0) { return true; |