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
@@ -20,4 +20,13 @@
 // 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>
@@ -34,8 +43,4 @@
 #include <assert.h>
 
-#include <qmap.h>
-
-#include "libtremorplugin.h"
-
 
 extern "C" {
@@ -63,5 +68,5 @@ public:
 
 LibTremorPlugin::LibTremorPlugin() {
-qDebug("<<<<<<<<<<<<<TREMOR!!!!!>>>>>>>>>>>>>>>>>>");
+odebug << "<<<<<<<<<<<<<TREMOR!!!!!>>>>>>>>>>>>>>>>>>" << oendl;
  d = new LibTremorPluginData;
   d->f = 0;
@@ -106,10 +111,10 @@ bool LibTremorPlugin::open( const QString& path ) {
   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;
   }
@@ -154,5 +159,5 @@ bool LibTremorPlugin::open( const QString& path ) {
   }
 
-  qDebug("finfo: " + d->finfo);
+  odebug << "finfo: " + d->finfo << oendl;
 
   return TRUE;
@@ -166,5 +171,5 @@ bool LibTremorPlugin::close() {
 
     if (fclose(d->f) == -1) {
-        qDebug("error closing file %s", d->filename);
+        odebug << "error closing file " << d->filename << "" << oendl;
   result = FALSE;
     }
@@ -194,5 +199,5 @@ 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;
 }
@@ -200,5 +205,5 @@ int LibTremorPlugin::audioChannels( int ) {
 
 int LibTremorPlugin::audioFrequency( int ) {
-  qDebug( "LibTremorPlugin::audioFrequency: %ld", d->vi->rate );
+  odebug << "LibTremorPlugin::audioFrequency: " << d->vi->rate << "" << oendl;
   return d->vi->rate;
 }
@@ -224,5 +229,5 @@ 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;
@@ -246,5 +251,5 @@ bool LibTremorPlugin::audioReadSamples( short *output, int, long samples, long&
 
     long ret = ov_read(&d->vf, buf, n, &d->csection);
-//    qDebug("%d", ret);
+//    odebug << "" << ret << "" << oendl;
     if (ret == 0) {
       break;