Diffstat (limited to 'noncore/multimedia/opieplayer2/videowidget.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/multimedia/opieplayer2/videowidget.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/noncore/multimedia/opieplayer2/videowidget.cpp b/noncore/multimedia/opieplayer2/videowidget.cpp index 2f51c82..23acfa3 100644 --- a/noncore/multimedia/opieplayer2/videowidget.cpp +++ b/noncore/multimedia/opieplayer2/videowidget.cpp | |||
@@ -62,28 +62,26 @@ const int yo = 0; // movable y offset | |||
62 | const char * const skinV_mask_file_names[7] = { | 62 | const char * const skinV_mask_file_names[7] = { |
63 | "play","stop","fwd","back","up","down","full" | 63 | "play","stop","fwd","back","up","down","full" |
64 | }; | 64 | }; |
65 | 65 | ||
66 | } | 66 | } |
67 | 67 | ||
68 | VideoWidget::VideoWidget( PlayListWidget &playList, MediaPlayerState &mediaPlayerState, QWidget* parent, const char* name ) | 68 | VideoWidget::VideoWidget( PlayListWidget &playList, MediaPlayerState &mediaPlayerState, QWidget* parent, const char* name ) |
69 | : MediaWidget( playList, mediaPlayerState, parent, name ), scaledWidth( 0 ), scaledHeight( 0 ) | 69 | : MediaWidget( playList, mediaPlayerState, parent, name ), scaledWidth( 0 ), scaledHeight( 0 ) |
70 | { | 70 | { |
71 | setCaption( tr("OpiePlayer - Video") ); | 71 | setCaption( tr("OpiePlayer - Video") ); |
72 | 72 | ||
73 | Button defaultButton; | 73 | Button defaultButton; |
74 | defaultButton.isToggle = defaultButton.isHeld = defaultButton.isDown = false; | 74 | Button toggleButton = defaultButton; |
75 | Button toggleButton; | 75 | toggleButton.buttonType = ToggleButton; |
76 | toggleButton.isToggle = true; | ||
77 | toggleButton.isHeld = toggleButton.isDown = false; | ||
78 | 76 | ||
79 | buttons.reserve( 7 ); | 77 | buttons.reserve( 7 ); |
80 | buttons.push_back( toggleButton ); // play | 78 | buttons.push_back( toggleButton ); // play |
81 | buttons.push_back( defaultButton ); // stop | 79 | buttons.push_back( defaultButton ); // stop |
82 | buttons.push_back( defaultButton ); // next | 80 | buttons.push_back( defaultButton ); // next |
83 | buttons.push_back( defaultButton ); // previous | 81 | buttons.push_back( defaultButton ); // previous |
84 | buttons.push_back( defaultButton ); // volUp | 82 | buttons.push_back( defaultButton ); // volUp |
85 | buttons.push_back( defaultButton ); // volDown | 83 | buttons.push_back( defaultButton ); // volDown |
86 | buttons.push_back( toggleButton ); //fullscreen | 84 | buttons.push_back( toggleButton ); //fullscreen |
87 | 85 | ||
88 | videoFrame = new XineVideoWidget ( this, "Video frame" ); | 86 | videoFrame = new XineVideoWidget ( this, "Video frame" ); |
89 | 87 | ||
@@ -289,25 +287,25 @@ void VideoWidget::mouseMoveEvent( QMouseEvent *event ) { | |||
289 | case VideoVolDown: | 287 | case VideoVolDown: |
290 | emit lessClicked(); | 288 | emit lessClicked(); |
291 | return; | 289 | return; |
292 | } | 290 | } |
293 | } else if ( !isOnButton && buttons[i].isHeld ) { | 291 | } else if ( !isOnButton && buttons[i].isHeld ) { |
294 | buttons[i].isHeld = FALSE; | 292 | buttons[i].isHeld = FALSE; |
295 | toggleButton(i); | 293 | toggleButton(i); |
296 | } | 294 | } |
297 | } else { | 295 | } else { |
298 | 296 | ||
299 | if ( buttons[i].isHeld ) { | 297 | if ( buttons[i].isHeld ) { |
300 | buttons[i].isHeld = FALSE; | 298 | buttons[i].isHeld = FALSE; |
301 | if ( !buttons[i].isToggle ) { | 299 | if ( buttons[i].buttonType != ToggleButton ) { |
302 | setToggleButton( i, FALSE ); | 300 | setToggleButton( i, FALSE ); |
303 | } | 301 | } |
304 | 302 | ||
305 | switch(i) { | 303 | switch(i) { |
306 | 304 | ||
307 | case VideoPlay: { | 305 | case VideoPlay: { |
308 | if( mediaPlayerState.isPaused() ) { | 306 | if( mediaPlayerState.isPaused() ) { |
309 | setToggleButton( i, FALSE ); | 307 | setToggleButton( i, FALSE ); |
310 | mediaPlayerState.setPaused( FALSE ); | 308 | mediaPlayerState.setPaused( FALSE ); |
311 | return; | 309 | return; |
312 | } else if( !mediaPlayerState.isPaused() ) { | 310 | } else if( !mediaPlayerState.isPaused() ) { |
313 | setToggleButton( i, TRUE ); | 311 | setToggleButton( i, TRUE ); |