6 files changed, 12 insertions, 17 deletions

diff --git a/noncore/multimedia/opieplayer2/audiowidget.cpp b/noncore/multimedia/opieplayer2/audiowidget.cpp
index 277d162..8c7e614 100644
--- a/noncore/multimedia/opieplayer2/audiowidget.cpp
+++ b/noncore/multimedia/opieplayer2/audiowidget.cpp
@@ -302,20 +302,12 @@ void AudioWidget::updateSlider( long i, long max ) {
         if ( slider.maxValue() != width ) {
             slider.setMaxValue( width );
         }
     }
 }
 
-
-void AudioWidget::setToggleButton( int i, bool down ) {
-    qDebug("setToggleButton %d", i);
-    if ( down != buttons[i].isDown ) {
-        toggleButton( i );
-    }
-}
-
 void AudioWidget::skipFor() {
     skipDirection = +1;
     startTimer( 50 );
     mediaPlayerState.setPosition( mediaPlayerState.position() + 2 );
 }
 
diff --git a/noncore/multimedia/opieplayer2/audiowidget.h b/noncore/multimedia/opieplayer2/audiowidget.h
index 8c433ac..9b276b5 100644
--- a/noncore/multimedia/opieplayer2/audiowidget.h
+++ b/noncore/multimedia/opieplayer2/audiowidget.h
@@ -87,13 +87,12 @@ protected:
     void keyReleaseEvent( QKeyEvent *e);
 private slots:
     void skipFor();
     void skipBack();
     void stopSkip();
 private:
-    void setToggleButton( int, bool );
     int skipDirection;
     QString skin;
     QImage  imgUp;
     QImage  imgDn;
 
     OTicker  songInfo;
diff --git a/noncore/multimedia/opieplayer2/mediawidget.cpp b/noncore/multimedia/opieplayer2/mediawidget.cpp
index 271f788..9c5291b 100644
--- a/noncore/multimedia/opieplayer2/mediawidget.cpp
+++ b/noncore/multimedia/opieplayer2/mediawidget.cpp
@@ -94,13 +94,13 @@ bool MediaWidget::isOverButton( const QPoint &position, int buttonId ) const
 }
 
 void MediaWidget::paintAllButtons( QPainter &p )
 {
     for ( ButtonMap::ConstIterator it = buttons.begin();
           it != buttons.end(); ++it )
-        paintButton( *it );
+        paintButton( p, *it );
 }
 
 void MediaWidget::paintButton( const Button &button )
 {
     QPainter p( this );
     paintButton( p, button );
@@ -111,12 +111,22 @@ void MediaWidget::paintButton( QPainter &p, const Button &button )
     if ( button.isDown )
         p.drawPixmap( upperLeftOfButtonMask, button.pixDown );
     else
         p.drawPixmap( upperLeftOfButtonMask, button.pixUp );
 }
 
+void MediaWidget::setToggleButton( int buttonId, bool down )
+{
+    qDebug("setToggleButton %d", buttonId );
+
+    Button &button = buttons[ buttonId ];
+
+    if ( down != button.isDown )
+        toggleButton( buttonId );
+}
+
 void MediaWidget::toggleButton( int buttonId )
 {
     Button &button = buttons[ buttonId ];
 
     button.isDown = !button.isDown;
 
diff --git a/noncore/multimedia/opieplayer2/mediawidget.h b/noncore/multimedia/opieplayer2/mediawidget.h
index 34910fb..b7860dc 100644
--- a/noncore/multimedia/opieplayer2/mediawidget.h
+++ b/noncore/multimedia/opieplayer2/mediawidget.h
@@ -88,12 +88,13 @@ protected:
     bool isOverButton( const QPoint &position, int buttonId ) const;
 
     void paintAllButtons( QPainter &p );
     void paintButton( const Button &button );
     void paintButton( QPainter &p, const Button &button );
 
+    void setToggleButton( int buttonId, bool down );
     void toggleButton( int buttonId );
 
     MediaPlayerState &mediaPlayerState;
     PlayListWidget &playList;
 
     ButtonMap buttons;
diff --git a/noncore/multimedia/opieplayer2/videowidget.cpp b/noncore/multimedia/opieplayer2/videowidget.cpp
index 8f6a8a9..db4a396 100644
--- a/noncore/multimedia/opieplayer2/videowidget.cpp
+++ b/noncore/multimedia/opieplayer2/videowidget.cpp
@@ -239,18 +239,12 @@ void VideoWidget::updateSlider( long i, long max ) {
         if ( slider->maxValue() != width ) {
             slider->setMaxValue( width );
         }
     }
 }
 
-void VideoWidget::setToggleButton( int i, bool down ) {
-    if ( down != buttons[i].isDown ) {
-        toggleButton( i );
-    }
-}
-
 void VideoWidget::mouseMoveEvent( QMouseEvent *event ) {
     for ( unsigned int i = 0; i < buttons.count(); i++ ) {
         if ( event->state() == QMouseEvent::LeftButton ) {
             // The test to see if the mouse click is inside the button or not
             bool isOnButton = isOverButton( event->pos() - upperLeftOfButtonMask, i );
 
diff --git a/noncore/multimedia/opieplayer2/videowidget.h b/noncore/multimedia/opieplayer2/videowidget.h
index 45279d7..915e9cc 100644
--- a/noncore/multimedia/opieplayer2/videowidget.h
+++ b/noncore/multimedia/opieplayer2/videowidget.h
@@ -98,13 +98,12 @@ private:
 //    Ticker songInfo;
     QImage  imgUp;
     QImage  imgDn;
     QString skin;
 
 
-    void setToggleButton( int, bool );
 
     QString backgroundPix;
     QSlider *slider;
     QImage *currentFrame;
     int scaledWidth;
     int scaledHeight;