1 files changed, 1 insertions, 24 deletions

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
@@ -232,120 +232,97 @@ void VideoWidget::updateSlider( long i, long max ) {
         return;
     }
     int width = slider->width();
     int val = int((double)i * width / max);
     if ( !mediaPlayerState.isFullscreen() && !videoSliderBeingMoved ) {
         if ( slider->value() != val ) {
             slider->setValue( val );
         }
         if ( slider->maxValue() != width ) {
             slider->setMaxValue( width );
         }
     }
 }
 
 void VideoWidget::mouseMoveEvent( QMouseEvent *event ) {
     for ( ButtonVector::iterator it = buttons.begin(); it != buttons.end(); ++it ) {
         Button &button = *it;
         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, command );
 
             if ( isOnButton && !button.isHeld ) {
                 button.isHeld = TRUE;
                 toggleButton( button );
 
                 switch ( command ) {
                 case VolumeUp:
                     emit moreClicked();
                     return;
                 case VolumeDown:
                     emit lessClicked();
                     return;
                 default: break;
                 }
             } else if ( !isOnButton && button.isHeld ) {
                         button.isHeld = FALSE;
                         toggleButton( button );
             }
         } 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 );
 }
 
 void VideoWidget::mouseReleaseEvent( QMouseEvent *event ) {
     if ( mediaPlayerState.isFullscreen() ) {
         mediaPlayerState.setFullscreen( FALSE );
         makeVisible();
     }
     mouseMoveEvent( event );
 }
 
 void VideoWidget::showEvent( QShowEvent* ) {
     QMouseEvent event( QEvent::MouseMove, QPoint( 0, 0 ), 0, 0 );
     mouseMoveEvent( &event );
 }
 
 
  void VideoWidget::backToNormal() {
      mediaPlayerState.setFullscreen( FALSE );
      makeVisible();
  }
 
 void VideoWidget::makeVisible() {
     if ( mediaPlayerState.isFullscreen() ) {
         setBackgroundMode( QWidget::NoBackground );
         showFullScreen();
         resize( qApp->desktop()->size() );
         videoFrame-> setGeometry ( 0, 0, width ( ), height ( ));
 
         slider->hide();
         disconnect( &mediaPlayerState, SIGNAL( positionChanged(long) ),this, SLOT( setPosition(long) ) );
         disconnect( &mediaPlayerState, SIGNAL( positionUpdated(long) ),this, SLOT( setPosition(long) ) );
         disconnect( slider, SIGNAL( sliderPressed() ), this, SLOT( sliderPressed() ) );
         disconnect( slider, SIGNAL( sliderReleased() ), this, SLOT( sliderReleased() ) );
 
     } else {
         showNormal();
         showMaximized();
         setBackgroundPixmap( backgroundPixmap );
         QWidget *d = QApplication::desktop();
         int w = d->width();
         int h = d->height();