1 files changed, 15 insertions, 10 deletions

diff --git a/core/multimedia/opieplayer/audiowidget.cpp b/core/multimedia/opieplayer/audiowidget.cpp
index 7da2d54..376f8d3 100644
--- a/core/multimedia/opieplayer/audiowidget.cpp
+++ b/core/multimedia/opieplayer/audiowidget.cpp
@@ -12,24 +12,29 @@
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** 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 "audiowidget.h"
+#include "mediaplayerstate.h"
+
+/* OPIE */
 #include <qpe/qpeapplication.h>
 #include <qpe/resource.h>
 #include <qpe/config.h>
+#include <opie2/odebug.h>
 
+/* QT */
 #include <qdir.h>
-#include "audiowidget.h"
-#include "mediaplayerstate.h"
 
+/* STD */
 #include <stdlib.h>
 #include <stdio.h>
 
 extern MediaPlayerState *mediaPlayerState;
 
 
 static const int xo = -2; // movable x offset
 static const int yo = 22; // movable y offset
@@ -66,31 +71,31 @@ static void changeTextColor( QWidget *w ) {
 }
 
 static const int numButtons = (sizeof(audioButtons)/sizeof(MediaButton));
 
 AudioWidget::AudioWidget(QWidget* parent, const char* name, WFlags f) :
     QWidget( parent, name, f ), songInfo( this ), slider( Qt::Horizontal, this ),  time( this )
 {
     setCaption( tr("OpiePlayer") );
-    //    qDebug("<<<<<audioWidget");
+    //    odebug << "<<<<<audioWidget" << oendl;
     
     Config cfg("OpiePlayer");
     cfg.setGroup("Options");
     skin = cfg.readEntry("Skin","default");
     //skin = "scaleTest";
 // color of background, frame, degree of transparency
 
 //    QString skinPath = "opieplayer/skins/" + skin;
     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;
     
     pixBg = new QPixmap( Resource::loadPixmap( QString("%1/background").arg(skinPath) ) );
     imgUp = new QImage( Resource::loadImage( QString("%1/skin_up").arg(skinPath) ) );
     imgDn = new QImage( Resource::loadImage( QString("%1/skin_down").arg(skinPath) ) );
 
     imgButtonMask = new QImage( imgUp->width(), imgUp->height(), 8, 255 );
     imgButtonMask->fill( 0 );
 
@@ -116,17 +121,17 @@ AudioWidget::AudioWidget(QWidget* parent, const char* name, WFlags f) :
         buttonPixDown[i] = NULL;
     }
 
  		QWidget *d = QApplication::desktop();
  		int width = d->width();
  		int height = d->height();
 
     if( (width != pixBg->width() ) || (height != pixBg->height() ) ) {
-//				qDebug("<<<<<<<< scale image >>>>>>>>>>>>");
+//              odebug << "<<<<<<<< scale image >>>>>>>>>>>>" << oendl;
 				QImage img;
 				img = pixBg->convertToImage();
 				pixBg->convertFromImage( img.smoothScale( width, height));
 		}
     setBackgroundPixmap( *pixBg);
 
     songInfo.setFocusPolicy( QWidget::NoFocus );
     
@@ -248,17 +253,17 @@ void AudioWidget::sliderReleased() {
     if ( slider.width() == 0 )
   return;
     long val = long((double)slider.value() * mediaPlayerState->length() / slider.width());
     mediaPlayerState->setPosition( val );
 }
 
 
 void AudioWidget::setPosition( long i ) {
-//    qDebug("set position %d",i);
+//    odebug << "set position " << i << "" << oendl;
     long length = mediaPlayerState->length();
     updateSlider( i, length );
 }
 
 
 void AudioWidget::setLength( long max ) {
     updateSlider( mediaPlayerState->position(), max );
 }
@@ -362,28 +367,28 @@ void AudioWidget::mouseMoveEvent( QMouseEvent *event ) {
               // The test to see if the mouse click is inside the button or not
             int x = event->pos().x() - xoff;
             int y = event->pos().y() - yoff;
 
             bool isOnButton = ( x > 0 && y > 0 && x < imgButtonMask->width()
                                 && y < imgButtonMask->height() && imgButtonMask->pixelIndex( x, y ) == i + 1 );
 
 //              if ( isOnButton && i == AudioVolumeUp ) 
-//                  qDebug("on up");
+//                  odebug << "on up" << oendl;
 
             if ( isOnButton && !audioButtons[i].isHeld ) {
                 audioButtons[i].isHeld = TRUE;
                 toggleButton(i);
                 switch (i) {
                   case AudioVolumeUp:   
-                     //                      qDebug("more clicked");
+                     //                      odebug << "more clicked" << oendl;
                       emit moreClicked(); 
                       return;
                   case AudioVolumeDown:
-                     //                      qDebug("less clicked");
+                     //                      odebug << "less clicked" << oendl;
                       emit lessClicked();
                       return;
                 case AudioForward:
                     emit forwardClicked();
                     return;
                 case AudioBack:
                     emit backClicked();
                     return;
@@ -465,17 +470,17 @@ void AudioWidget::paintEvent( QPaintEvent * pe) {
 void AudioWidget::keyReleaseEvent( QKeyEvent *e)
 {
     switch ( e->key() ) {
 ////////////////////////////// Zaurus keys
       case Key_Home:
           break;
       case Key_F9: //activity
            hide();
-//           qDebug("Audio F9");
+//           odebug << "Audio F9" << oendl;
           break;
       case Key_F10: //contacts
           break;
       case Key_F11: //menu
           break;
       case Key_F12: //home
           break;
       case Key_F13: //mail