- removing duplicated code in VideoWidget

4 files changed, 9 insertions, 27 deletions

diff --git a/noncore/multimedia/opieplayer2/mediawidget.cpp b/noncore/multimedia/opieplayer2/mediawidget.cpp
index c0ebd63..7eb75e6 100644
--- a/noncore/multimedia/opieplayer2/mediawidget.cpp
+++ b/noncore/multimedia/opieplayer2/mediawidget.cpp
@@ -64,29 +64,34 @@ void MediaWidget::paintEvent( QPaintEvent *pe )
         QPainter p2( this );
         p2.drawPixmap( pe->rect().topLeft(), pix );
     } else {
         QPainter p( this );
         paintAllButtons( p );
     }
 }
 
+void MediaWidget::makeVisible()
+{
+}
+
 void MediaWidget::handleCommand( Command command, bool buttonDown )
 {
     switch ( command ) {
         case Play:       mediaPlayerState.togglePaused();
         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 Loop:       mediaPlayerState.setLooping( buttonDown ); return;
         case VolumeUp:   emit moreReleased(); return;
         case VolumeDown: emit lessReleased(); return;
         case PlayList:   mediaPlayerState.setList();  return;
         case Forward:    emit forwardReleased(); return;
         case Back:       emit backReleased(); return;
+        case FullScreen: mediaPlayerState.setFullscreen( true ); makeVisible(); return;
         default: assert( false );
     }
 }
 
 bool MediaWidget::isOverButton( const QPoint &position, int buttonId ) const
 {
     return ( position.x() > 0 && position.y() > 0 && 
              position.x() < buttonMask.width() && 
diff --git a/noncore/multimedia/opieplayer2/mediawidget.h b/noncore/multimedia/opieplayer2/mediawidget.h
index caae0a7..3f4c45d 100644
--- a/noncore/multimedia/opieplayer2/mediawidget.h
+++ b/noncore/multimedia/opieplayer2/mediawidget.h
@@ -78,16 +78,18 @@ signals:
     void forwardReleased();
     void backReleased();
 
 protected:
     virtual void closeEvent( QCloseEvent * );
 
     virtual void paintEvent( QPaintEvent *pe );
 
+    virtual void makeVisible();
+
     void handleCommand( Command command, bool buttonDown );
 
     bool isOverButton( const QPoint &position, int buttonId ) const;
 
     void paintAllButtons( QPainter &p );
     void paintButton( const Button &button );
     void paintButton( QPainter &p, const Button &button );
 
diff --git a/noncore/multimedia/opieplayer2/videowidget.cpp b/noncore/multimedia/opieplayer2/videowidget.cpp
index 12316f8..cc586cc 100644
--- a/noncore/multimedia/opieplayer2/videowidget.cpp
+++ b/noncore/multimedia/opieplayer2/videowidget.cpp
@@ -272,40 +272,17 @@ void VideoWidget::mouseMoveEvent( QMouseEvent *event ) {
         } else {
 
             if ( button.isHeld ) {
                 button.isHeld = FALSE;
                 if ( button.type != ToggleButton ) {
                     setToggleButton( button, FALSE );
                 }
 
-                switch( command ) {
-
-                case Play: {
-                    if( mediaPlayerState.isPaused() ) {
-                        setToggleButton( button, FALSE );
-                        mediaPlayerState.setPaused( FALSE );
-                        return;
-                    } else if( !mediaPlayerState.isPaused() ) {
-                        setToggleButton( button, TRUE );
-                        mediaPlayerState.setPaused( TRUE );
-                        return;
-                    } else {
-                        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;
-                }
+                handleCommand( command, button.isDown );
             }
         }
     }
 }
 
 void VideoWidget::mousePressEvent( QMouseEvent *event ) {
     mouseMoveEvent( event );
 }
diff --git a/noncore/multimedia/opieplayer2/videowidget.h b/noncore/multimedia/opieplayer2/videowidget.h
index c3bc131..ef88186 100644
--- a/noncore/multimedia/opieplayer2/videowidget.h
+++ b/noncore/multimedia/opieplayer2/videowidget.h
@@ -52,30 +52,28 @@ public:
 
 
     XineVideoWidget* vidWidget();
 public slots:
     void updateSlider( long, long );
     void sliderPressed( );
     void sliderReleased( );
     void setFullscreen( bool b );
-    void makeVisible();
+    virtual void makeVisible();
     void backToNormal();
     void setPosition( long );
 
 public:
     virtual void setPlaying( bool b);
     virtual void setLength( long );
     virtual void setDisplayType( MediaPlayerState::DisplayType displayType );
 
 signals:
     void moreClicked();
     void lessClicked();
-    void moreReleased();
-    void lessReleased();
     void sliderMoved( long );
     void videoResized ( const QSize &s );
 
 protected:
 
     void resizeEvent( QResizeEvent * );
     void showEvent( QShowEvent *se );
     void mouseMoveEvent( QMouseEvent *event );