1 files changed, 22 insertions, 17 deletions

diff --git a/core/multimedia/opieplayer/videowidget.cpp b/core/multimedia/opieplayer/videowidget.cpp
index 164458b..e851044 100644
--- a/core/multimedia/opieplayer/videowidget.cpp
+++ b/core/multimedia/opieplayer/videowidget.cpp
@@ -14,21 +14,26 @@
  ** 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 "videowidget.h"
+#include "mediaplayerstate.h"
+
+/* OPIE */
 #include <qpe/resource.h>
 #include <qpe/mediaplayerplugininterface.h>
 #include <qpe/config.h>
 #include <qpe/qpeapplication.h>
+#include <opie2/odebug.h>
 
+/* QT */
 #include <qdir.h>
 #include <qslider.h>
-#include "videowidget.h"
-#include "mediaplayerstate.h"
 
 
 #ifdef Q_WS_QWS
 # define USE_DIRECT_PAINTER
 # include <qdirectpainter_qws.h>
 # include <qgfxraster_qws.h>
@@ -79,13 +84,13 @@ VideoWidget::VideoWidget(QWidget* parent, const char* name, WFlags f) :
 
    QString skinPath;
    skinPath = "opieplayer2/skins/" + skin;
     if(!QDir(QString(getenv("OPIEDIR")) +"/pics/"+skinPath).exists())
       skinPath = "opieplayer2/skins/default";
 
-    //   qDebug("skin path " + skinPath);
+    //   odebug << "skin path " + skinPath << oendl;
 
 //     QString skinPath = "opieplayer2/skins/" + skin;
 
    pixBg = new QPixmap( Resource::loadPixmap( QString("%1/background").arg(skinPath) ) );
    imgUp = new QImage( Resource::loadImage( QString("%1/skinV_up").arg(skinPath) ) );
    imgDn = new QImage( Resource::loadImage( QString("%1/skinV_down").arg(skinPath) ) );
@@ -93,13 +98,13 @@ VideoWidget::VideoWidget(QWidget* parent, const char* name, WFlags f) :
    imgButtonMask = new QImage( imgUp->width(), imgUp->height(), 8, 255 );
    imgButtonMask->fill( 0 );
 
    for ( int i = 0; i < 7; i++ ) {
       QString filename = QString( QPEApplication::qpeDir() + "/pics/" + skinPath +
                                   "/skinV_mask_" + skinV_mask_file_names[i] + ".png" );
-      //      qDebug("loading "+filename);
+      //      odebug << "loading "+filename << oendl;
       masks[i] = new QBitmap( filename );
 
       if ( !masks[i]->isNull() ) {
          QImage imgMask = masks[i]->convertToImage();
          uchar **dest = imgButtonMask->jumpTable();
          for ( int y = 0; y < imgUp->height(); y++ ) {
@@ -108,29 +113,29 @@ VideoWidget::VideoWidget(QWidget* parent, const char* name, WFlags f) :
                if ( !qRed( imgMask.pixel( x, y ) ) )
                   line[x] = i + 1;
             }
          }
       }
    }
-   //   qDebug("finished loading first pics");
+   //   odebug << "finished loading first pics" << oendl;
    for ( int i = 0; i < 7; i++ ) {
       buttonPixUp[i] = NULL;
       buttonPixDown[i] = NULL;
    }
 
 
- 		QWidget *d = QApplication::desktop();
- 		int width = d->width();
- 		int height = d->height();
+        QWidget *d = QApplication::desktop();
+        int width = d->width();
+        int height = d->height();
 
     if( (width != pixBg->width() ) || (height != pixBg->height() ) ) {
-//				qDebug("<<<<<<<< scale image >>>>>>>>>>>>");
-				QImage img;
-				img = pixBg->convertToImage();
-				pixBg->convertFromImage( img.smoothScale( width, height));
-		}
+//              odebug << "<<<<<<<< scale image >>>>>>>>>>>>" << oendl;
+                QImage img;
+                img = pixBg->convertToImage();
+                pixBg->convertFromImage( img.smoothScale( width, height));
+        }
    setBackgroundPixmap( *pixBg );
 
    currentFrame = new QImage( 220 + 2, 160, (QPixmap::defaultDepth() == 16) ? 16 : 32 );
 
    slider = new QSlider( Qt::Horizontal, this );
    slider->setMinValue( 0 );
@@ -350,26 +355,26 @@ void VideoWidget::mouseMoveEvent( QMouseEvent *event ) {
                     setToggleButton( i, FALSE );
                 }
 
                 switch(i) {
 
                 case VideoPlay: {
-                   //                   qDebug("play");
+                   //                   odebug << "play" << oendl;
                    if(  !mediaPlayerState->playing()) {
                       mediaPlayerState->setPlaying( true);
                       setToggleButton( i-1, false );
                       setToggleButton( i, false );
                       return;
                    }
                    if( mediaPlayerState->isPaused ) {
-                      //                      qDebug("isPaused");
+                      //                      odebug << "isPaused" << oendl;
                       setToggleButton( i, FALSE );
                       mediaPlayerState->setPaused( FALSE );
                         return;
                     } else if( !mediaPlayerState->isPaused ) {
-                       //                       qDebug("is not paused");
+                       //                       odebug << "is not paused" << oendl;
                         setToggleButton( i, TRUE );
                         mediaPlayerState->setPaused( TRUE );
                         return;
                     } else {
                         return;
                     }
@@ -455,13 +460,13 @@ void VideoWidget::closeEvent( QCloseEvent* ) {
    mediaPlayerState->setList();
 }
 
 
 bool VideoWidget::playVideo() {
    bool result = FALSE;
-//   qDebug("<<<<<<<<<<<<<<<< play video");
+//   odebug << "<<<<<<<<<<<<<<<< play video" << oendl;
    int stream = 0;
 
    int sw = mediaPlayerState->curDecoder()->videoWidth( stream );
    int sh = mediaPlayerState->curDecoder()->videoHeight( stream );
    int dd = QPixmap::defaultDepth();
    int w = height();