1 files changed, 19 insertions, 15 deletions

diff --git a/core/multimedia/opieplayer/mediaplayerstate.cpp b/core/multimedia/opieplayer/mediaplayerstate.cpp
index 5bfb87e..b700cd1 100644
--- a/core/multimedia/opieplayer/mediaplayerstate.cpp
+++ b/core/multimedia/opieplayer/mediaplayerstate.cpp
@@ -14,28 +14,32 @@
  ** See http://www.trolltech.com/gpl/ for GPL licensing information.
  **
  ** Contact info@trolltech.com if any conditions of this licensing are
  ** not clear to you.
  **
  **********************************************************************/
-#include <qpe/qpeapplication.h>
-#include <qpe/qlibrary.h>
-#include <qpe/config.h>
-#include <qdir.h>
-#include <qpe/mediaplayerplugininterface.h>
-#include "mediaplayerstate.h"
-
-
 
 #ifdef QT_NO_COMPONENT
 // Plugins which are compiled in when no plugin architecture available
 #include "libmad/libmadpluginimpl.h"
 #include "libmpeg3/libmpeg3pluginimpl.h"
 #include "wavplugin/wavpluginimpl.h"
 #endif
 
+#include "mediaplayerstate.h"
+
+/* OPIE */
+#include <qpe/qpeapplication.h>
+#include <qpe/qlibrary.h>
+#include <qpe/config.h>
+#include <qpe/mediaplayerplugininterface.h>
+#include <opie2/odebug.h>
+
+/* QT */
+#include <qdir.h>
+
 
 //#define MediaPlayerDebug(x) qDebug x
 #define MediaPlayerDebug(x)
 
 
 MediaPlayerState::MediaPlayerState( QObject *parent, const char *name )
@@ -101,14 +105,14 @@ MediaPlayerDecoder *MediaPlayerState::newDecoder( const QString& file ) {
             break;
         }
     }
     if(file.left(4)=="http")
         isStreaming = TRUE;
     else
-        isStreaming = FALSE;  
-    return decoder = tmpDecoder; 
+        isStreaming = FALSE;
+    return decoder = tmpDecoder;
 }
 
 
 MediaPlayerDecoder *MediaPlayerState::curDecoder() {
     return decoder;
 }
@@ -122,13 +126,13 @@ MediaPlayerDecoder *MediaPlayerState::libMpeg3Decoder() {
 // ### hack to get true sample count
 // MediaPlayerDecoder *MediaPlayerState::libWavDecoder() {
 //     return libwavdecoder;
 // }
 
 void MediaPlayerState::loadPlugins() {
-   //    qDebug("load plugins");
+   //    odebug << "load plugins" << oendl;
 #ifndef QT_NO_COMPONENT
     QValueList<MediaPlayerPlugin>::Iterator mit;
     for ( mit = pluginList.begin(); mit != pluginList.end(); ++mit ) {
         (*mit).iface->release();
         (*mit).library->unload();
         delete (*mit).library;
@@ -139,17 +143,17 @@ void MediaPlayerState::loadPlugins() {
     QDir dir( path, "lib*.so" );
     QStringList list = dir.entryList();
     QStringList::Iterator it;
     for ( it = list.begin(); it != list.end(); ++it ) {
         MediaPlayerPluginInterface *iface = 0;
         QLibrary *lib = new QLibrary( path + "/" + *it );
-//   qDebug( "querying: %s", QString( path + "/" + *it ).latin1() );
+//   odebug << "querying: " << QString( path + "/" + *it ) << "" << oendl;
 
         if ( lib->queryInterface( IID_MediaPlayerPlugin, (QUnknownInterface**)&iface ) == QS_OK ) {
 
-//       qDebug( "loading: %s", QString( path + "/" + *it ).latin1() );
+//       odebug << "loading: " << QString( path + "/" + *it ) << "" << oendl;
 
             MediaPlayerPlugin plugin;
             plugin.library = lib;
             plugin.iface = iface;
             plugin.decoder = plugin.iface->decoder();
             plugin.encoder = plugin.iface->encoder();
@@ -162,13 +166,13 @@ void MediaPlayerState::loadPlugins() {
         } else {
             delete lib;
         }
     }
 #else
     pluginList.clear();
-    
+
     MediaPlayerPlugin plugin0;
     plugin0.iface = new LibMpeg3PluginImpl;
     plugin0.decoder = plugin0.iface->decoder();
     plugin0.encoder = plugin0.iface->encoder();
     pluginList.append( plugin0 );
 
@@ -182,12 +186,12 @@ void MediaPlayerState::loadPlugins() {
     plugin2.iface = new WavPluginImpl;
     plugin2.decoder = plugin2.iface->decoder();
     plugin2.encoder = plugin2.iface->encoder();
     pluginList.append( plugin2 );
 #endif
 
-    if ( pluginList.count() ) 
+    if ( pluginList.count() )
         MediaPlayerDebug(( "%i decoders found", pluginList.count() ));
     else
         MediaPlayerDebug(( "No decoders found" ));
 }