- transition to MediaWidget::Command completed

5 files changed, 30 insertions, 28 deletions

diff --git a/noncore/multimedia/opieplayer2/audiowidget.h b/noncore/multimedia/opieplayer2/audiowidget.h
index 092e5ce..9b276b5 100644
--- a/noncore/multimedia/opieplayer2/audiowidget.h
+++ b/noncore/multimedia/opieplayer2/audiowidget.h
@@ -56,19 +56,19 @@ public:
     ~AudioWidget();
     void setTickerText( const QString &text ) { songInfo.setText( text ); }
 public slots:
     void updateSlider( long, long );
     void sliderPressed( );
     void sliderReleased( );
-    void setLooping( bool b) { setToggleButton( buttons[ Loop ], b ); }
+    void setLooping( bool b) { setToggleButton( Loop, b ); }
     void setPosition( long );
     void setSeekable( bool );
 
 public:
     virtual void setLength( long );
-    virtual void setPlaying( bool b) { setToggleButton( buttons[ Play ], b ); }
+    virtual void setPlaying( bool b) { setToggleButton( Play, b ); }
     virtual void setDisplayType( MediaPlayerState::DisplayType displayType );
 
 signals:
     void moreClicked();
     void lessClicked();
     void forwardClicked();
diff --git a/noncore/multimedia/opieplayer2/mediawidget.cpp b/noncore/multimedia/opieplayer2/mediawidget.cpp
index 7891a7e..c0ebd63 100644
--- a/noncore/multimedia/opieplayer2/mediawidget.cpp
+++ b/noncore/multimedia/opieplayer2/mediawidget.cpp
@@ -112,12 +112,21 @@ 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( Command command, bool down )
+{
+    for ( ButtonVector::iterator it = buttons.begin(); it != buttons.end(); ++it )
+        if ( it->command == command ) {
+            setToggleButton( *it, down );
+            return;
+        }
+}
+
 void MediaWidget::setToggleButton( Button &button, bool down )
 {
     if ( down != button.isDown )
         toggleButton( button );
 }
 
diff --git a/noncore/multimedia/opieplayer2/mediawidget.h b/noncore/multimedia/opieplayer2/mediawidget.h
index 3bf01b6..caae0a7 100644
--- a/noncore/multimedia/opieplayer2/mediawidget.h
+++ b/noncore/multimedia/opieplayer2/mediawidget.h
@@ -89,12 +89,13 @@ protected:
 
     void paintAllButtons( QPainter &p );
     void paintButton( const Button &button );
     void paintButton( QPainter &p, const Button &button );
 
     void setToggleButton( Button &button, bool down );
+    void setToggleButton( Command command, bool down );
     void toggleButton( Button &button );
 
     MediaPlayerState &mediaPlayerState;
     PlayListWidget &playList;
 
     ButtonVector buttons;
diff --git a/noncore/multimedia/opieplayer2/videowidget.cpp b/noncore/multimedia/opieplayer2/videowidget.cpp
index 4867ef1..06f6cd2 100644
--- a/noncore/multimedia/opieplayer2/videowidget.cpp
+++ b/noncore/multimedia/opieplayer2/videowidget.cpp
@@ -109,13 +109,13 @@ VideoWidget::VideoWidget( PlayListWidget &playList, MediaPlayerState &mediaPlaye
             QImage imgMask = button.mask.convertToImage();
             uchar **dest = buttonMask.jumpTable();
             for ( int y = 0; y < imgUp.height(); y++ ) {
                 uchar *line = dest[y];
                 for ( int x = 0; x < imgUp.width(); x++ )
                     if ( !qRed( imgMask.pixel( x, y ) ) )
-                        line[x] = i + 1;
+                        line[x] = button.command + 1;
             }
         }
 
         buttons.push_back( button );
     }
 
@@ -244,28 +244,30 @@ void VideoWidget::updateSlider( long i, long max ) {
 }
 
 void VideoWidget::mouseMoveEvent( QMouseEvent *event ) {
     for ( unsigned int i = 0; i < buttons.size(); i++ ) {
 
         Button &button = buttons[ i ];
+        Command command = button.command;
 
         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 );
+            bool isOnButton = isOverButton( event->pos() - upperLeftOfButtonMask, command );
 
             if ( isOnButton && !button.isHeld ) {
                 button.isHeld = TRUE;
                 toggleButton( button );
 
-                switch (i) {
-                case VideoVolUp:
+                switch ( command ) {
+                case VolumeUp:
                     emit moreClicked();
                     return;
-                case VideoVolDown:
+                case VolumeDown:
                     emit lessClicked();
                     return;
+                default: break;
                 }
             } else if ( !isOnButton && button.isHeld ) {
                         button.isHeld = FALSE;
                         toggleButton( button );
             }
         } else {
@@ -273,15 +275,15 @@ void VideoWidget::mouseMoveEvent( QMouseEvent *event ) {
             if ( button.isHeld ) {
                 button.isHeld = FALSE;
                 if ( button.type != ToggleButton ) {
                     setToggleButton( button, FALSE );
                 }
 
-                switch(i) {
+                switch( command ) {
 
-                case VideoPlay: {
+                case Play: {
                     if( mediaPlayerState.isPaused() ) {
                         setToggleButton( button, FALSE );
                         mediaPlayerState.setPaused( FALSE );
                         return;
                     } else if( !mediaPlayerState.isPaused() ) {
                         setToggleButton( button, TRUE );
@@ -289,18 +291,19 @@ void VideoWidget::mouseMoveEvent( QMouseEvent *event ) {
                         return;
                     } else {
                         return;
                     }
                 }
 
-                case VideoStop:       mediaPlayerState.setPlaying( FALSE ); return;
-		case VideoNext:       if( playList.currentTab() == PlayListWidget::CurrentPlayList ) mediaPlayerState.setNext(); return;
-		case VideoPrevious:   if( playList.currentTab() == PlayListWidget::CurrentPlayList ) mediaPlayerState.setPrev(); return;
-                case VideoVolUp:      emit moreReleased(); return;
-                case VideoVolDown:    emit lessReleased(); return;
-                case VideoFullscreen: mediaPlayerState.setFullscreen( TRUE ); makeVisible(); return;
+                case Stop:       mediaPlayerState.setPlaying( FALSE ); return;
+                case Next:       if( playList.currentTab() == PlayListWidget::CurrentPlayList ) mediaPlayerState.setNext(); return;
+                case Previous:   if( playList.currentTab() == PlayListWidget::CurrentPlayList ) mediaPlayerState.setPrev(); return;
+                case VolumeUp:      emit moreReleased(); return;
+                case VolumeDown:    emit lessReleased(); return;
+                case FullScreen: mediaPlayerState.setFullscreen( TRUE ); makeVisible(); return;
+                default: break;
                 }
             }
         }
     }
 }
 
@@ -424,14 +427,14 @@ void VideoWidget::keyReleaseEvent( QKeyEvent *e) {
 XineVideoWidget* VideoWidget::vidWidget() {
     return videoFrame;
 }
 
 
 void VideoWidget::setFullscreen ( bool b ) {
-    setToggleButton( buttons[ VideoFullscreen ], b );
+    setToggleButton( FullScreen, b );
 }
 
 
 void VideoWidget::setPlaying( bool b) {
-    setToggleButton( buttons[ VideoPlay ], b );
+    setToggleButton( Play, b );
 }
 
diff --git a/noncore/multimedia/opieplayer2/videowidget.h b/noncore/multimedia/opieplayer2/videowidget.h
index 915e9cc..c3bc131 100644
--- a/noncore/multimedia/opieplayer2/videowidget.h
+++ b/noncore/multimedia/opieplayer2/videowidget.h
@@ -41,23 +41,12 @@
 
 #include "mediawidget.h"
 
 class QPixmap;
 class QSlider;
 
-enum VideoButtons {
-    VideoPlay = 0,
-    VideoStop,
-//    VideoPause,
-    VideoNext,
-    VideoPrevious,
-    VideoVolUp,
-    VideoVolDown,
-    VideoFullscreen
-};
-
 class VideoWidget : public MediaWidget {
     Q_OBJECT
 public:
     VideoWidget( PlayListWidget &playList, MediaPlayerState &mediaPlayerState, QWidget* parent=0, const char* name=0 );
     ~VideoWidget();