1 files changed, 25 insertions, 17 deletions

diff --git a/core/multimedia/opieplayer/loopcontrol.cpp b/core/multimedia/opieplayer/loopcontrol.cpp
index 4ed5921..91153fd 100644
--- a/core/multimedia/opieplayer/loopcontrol.cpp
+++ b/core/multimedia/opieplayer/loopcontrol.cpp
@@ -20,9 +20,22 @@
 // L.J.Potter added changes Fri 02-15-2002
 
+
+#include "mediaplayerstate.h"
+#include "loopcontrol.h"
+#include "videowidget.h"
+#include "audiodevice.h"
+
+/* OPIE */
 #include <qpe/qpeapplication.h>
+#include <qpe/mediaplayerplugininterface.h>
+#include <opie2/odebug.h>
 
 #ifdef Q_WS_QWS
 #include <qpe/qcopenvelope_qws.h>
 #endif
+
+/* QT */
+
+/* STD */
 #include <stdio.h>
 #include <stdlib.h>
@@ -31,9 +44,4 @@
 #include <errno.h>
 #include <unistd.h>
-#include "loopcontrol.h"
-#include "videowidget.h"
-#include "audiodevice.h"
-#include <qpe/mediaplayerplugininterface.h>
-#include "mediaplayerstate.h"
 
 
@@ -101,5 +109,5 @@ LoopControl::LoopControl( QObject *parent, const char *name )
     isMuted = FALSE;
     connect( qApp, SIGNAL( volumeChanged(bool) ), this, SLOT( setMute(bool) ) );
-    //qDebug("starting loopcontrol");
+    //odebug << "starting loopcontrol" << oendl;
     audioMutex = new Mutex;
 
@@ -113,10 +121,10 @@ LoopControl::LoopControl( QObject *parent, const char *name )
         pthread_attr_setschedparam(&audio_attr,&params);
     } else {
-       //        qDebug( "Error setting up a realtime thread, reverting to using a normal thread." );
+       //        odebug << "Error setting up a realtime thread, reverting to using a normal thread." << oendl;
         pthread_attr_destroy(&audio_attr);
         pthread_attr_init(&audio_attr);
     }
 #endif
-    //qDebug("create audio thread");
+    //odebug << "create audio thread" << oendl;
     pthread_create(&audio_tid, &audio_attr, (void * (*)(void *))startAudioThread, this);
 }
@@ -154,5 +162,5 @@ void LoopControl::timerEvent( QTimerEvent *te ) {
 void LoopControl::setPosition( long pos ) {
     audioMutex->lock();
-//    qDebug("Loop control %d", pos);
+//    odebug << "Loop control " << pos << "" << oendl;
     if ( hasVideoChannel && hasAudioChannel ) {
         playtime.restart();
@@ -229,5 +237,5 @@ void LoopControl::startAudio() {
 
 //              if ( currentSample != audioSampleCounter + 1 )
-//                  qDebug("out of sync with decoder %i %i", currentSample, audioSampleCounter);
+//                  odebug << "out of sync with decoder " << currentSample << " " << audioSampleCounter << "" << oendl;
 
             long samplesRead = 0;
@@ -242,5 +250,5 @@ void LoopControl::startAudio() {
            }
          else if ( sampleWaitTime <= -5000 ) {
-            //        qDebug("need to catch up by: %li (%i,%li)", -sampleWaitTime, currentSample, sampleWeShouldBeAt );
+            //        odebug << "need to catch up by: " << -sampleWaitTime << " (" << currentSample << "," << sampleWeShouldBeAt << ")" << oendl;
  //       //mediaPlayerState->curDecoder()->audioSetSample( sampleWeShouldBeAt, stream );
         currentSample = sampleWeShouldBeAt;
@@ -362,5 +370,5 @@ bool LoopControl::init( const QString& filename ) {
     current_frame = total_video_frames = total_audio_samples = 0;
     
-    //    qDebug( "Using the %s decoder", mediaPlayerState->curDecoder()->pluginName() );
+    //    odebug << "Using the " << mediaPlayerState->curDecoder()->pluginName() << " decoder" << oendl;
    
       // ### Hack to use libmpeg3plugin to get the number of audio samples if we are using the libmad plugin
@@ -388,5 +396,5 @@ bool LoopControl::init( const QString& filename ) {
             channels = mediaPlayerState->curDecoder()->audioChannels( astream );
 
-        //        qDebug( "LC- channels = %d", channels );
+        //        odebug << "LC- channels = " << channels << "" << oendl;
   
 //        if ( !total_audio_samples )
@@ -394,9 +402,9 @@ bool LoopControl::init( const QString& filename ) {
 
         total_audio_samples += 1000;
-        //        qDebug("total samples %d", total_audio_samples);
+        //        odebug << "total samples " << total_audio_samples << "" << oendl;
         mediaPlayerState->setLength( total_audio_samples );
   
         freq = mediaPlayerState->curDecoder()->audioFrequency( astream );
-        //        qDebug( "LC- frequency = %d", freq );
+        //        odebug << "LC- frequency = " << freq << "" << oendl;
 
         audioSampleCounter = 0;
@@ -404,5 +412,5 @@ bool LoopControl::init( const QString& filename ) {
         if ( mediaPlayerState->curDecoder()->pluginName() == QString("LibWavPlugin") ) {
             bits_per_sample =(int) mediaPlayerState->curDecoder()->getTime();
-            //            qDebug("using stupid hack");
+            //            odebug << "using stupid hack" << oendl;
         } else {
             bits_per_sample=0;
@@ -452,5 +460,5 @@ bool LoopControl::init( const QString& filename ) {
 
 void LoopControl::play() {
-   //    qDebug("LC- play");
+   //    odebug << "LC- play" << oendl;
     mediaPlayerState->setPosition( 0); //uglyhack