Diffstat (limited to 'noncore/multimedia/opieplayer2/videowidget.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/multimedia/opieplayer2/videowidget.cpp | 33 |
1 files changed, 18 insertions, 15 deletions
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 @@ -113,5 +113,5 @@ VideoWidget::VideoWidget( PlayListWidget &playList, MediaPlayerState &mediaPlaye for ( int x = 0; x < imgUp.width(); x++ ) if ( !qRed( imgMask.pixel( x, y ) ) ) - line[x] = i + 1; + line[x] = button.command + 1; } } @@ -248,8 +248,9 @@ void VideoWidget::mouseMoveEvent( QMouseEvent *event ) { 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 ) { @@ -257,11 +258,12 @@ void VideoWidget::mouseMoveEvent( QMouseEvent *event ) { 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 ) { @@ -277,7 +279,7 @@ void VideoWidget::mouseMoveEvent( QMouseEvent *event ) { } - switch(i) { + switch( command ) { - case VideoPlay: { + case Play: { if( mediaPlayerState.isPaused() ) { setToggleButton( button, FALSE ); @@ -293,10 +295,11 @@ void VideoWidget::mouseMoveEvent( QMouseEvent *event ) { } - 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; } } @@ -428,10 +431,10 @@ XineVideoWidget* VideoWidget::vidWidget() { void VideoWidget::setFullscreen ( bool b ) { - setToggleButton( buttons[ VideoFullscreen ], b ); + setToggleButton( FullScreen, b ); } void VideoWidget::setPlaying( bool b) { - setToggleButton( buttons[ VideoPlay ], b ); + setToggleButton( Play, b ); } |