Diffstat (limited to 'noncore/multimedia/opieplayer2/videowidget.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/multimedia/opieplayer2/videowidget.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/noncore/multimedia/opieplayer2/videowidget.cpp b/noncore/multimedia/opieplayer2/videowidget.cpp index db4a396..673c9e8 100644 --- a/noncore/multimedia/opieplayer2/videowidget.cpp +++ b/noncore/multimedia/opieplayer2/videowidget.cpp | |||
@@ -247,43 +247,43 @@ void VideoWidget::mouseMoveEvent( QMouseEvent *event ) { | |||
247 | if ( event->state() == QMouseEvent::LeftButton ) { | 247 | if ( event->state() == QMouseEvent::LeftButton ) { |
248 | // The test to see if the mouse click is inside the button or not | 248 | // The test to see if the mouse click is inside the button or not |
249 | bool isOnButton = isOverButton( event->pos() - upperLeftOfButtonMask, i ); | 249 | bool isOnButton = isOverButton( event->pos() - upperLeftOfButtonMask, i ); |
250 | 250 | ||
251 | if ( isOnButton && !buttons[i].isHeld ) { | 251 | if ( isOnButton && !buttons[i].isHeld ) { |
252 | buttons[i].isHeld = TRUE; | 252 | buttons[i].isHeld = TRUE; |
253 | toggleButton(i); | 253 | toggleButton( buttons[ i ] ); |
254 | 254 | ||
255 | switch (i) { | 255 | switch (i) { |
256 | case VideoVolUp: | 256 | case VideoVolUp: |
257 | emit moreClicked(); | 257 | emit moreClicked(); |
258 | return; | 258 | return; |
259 | case VideoVolDown: | 259 | case VideoVolDown: |
260 | emit lessClicked(); | 260 | emit lessClicked(); |
261 | return; | 261 | return; |
262 | } | 262 | } |
263 | } else if ( !isOnButton && buttons[i].isHeld ) { | 263 | } else if ( !isOnButton && buttons[i].isHeld ) { |
264 | buttons[i].isHeld = FALSE; | 264 | buttons[i].isHeld = FALSE; |
265 | toggleButton(i); | 265 | toggleButton( buttons[ i ] ); |
266 | } | 266 | } |
267 | } else { | 267 | } else { |
268 | 268 | ||
269 | if ( buttons[i].isHeld ) { | 269 | if ( buttons[i].isHeld ) { |
270 | buttons[i].isHeld = FALSE; | 270 | buttons[i].isHeld = FALSE; |
271 | if ( buttons[i].type != ToggleButton ) { | 271 | if ( buttons[i].type != ToggleButton ) { |
272 | setToggleButton( i, FALSE ); | 272 | setToggleButton( buttons[ i ], FALSE ); |
273 | } | 273 | } |
274 | 274 | ||
275 | switch(i) { | 275 | switch(i) { |
276 | 276 | ||
277 | case VideoPlay: { | 277 | case VideoPlay: { |
278 | if( mediaPlayerState.isPaused() ) { | 278 | if( mediaPlayerState.isPaused() ) { |
279 | setToggleButton( i, FALSE ); | 279 | setToggleButton( buttons[ i ], FALSE ); |
280 | mediaPlayerState.setPaused( FALSE ); | 280 | mediaPlayerState.setPaused( FALSE ); |
281 | return; | 281 | return; |
282 | } else if( !mediaPlayerState.isPaused() ) { | 282 | } else if( !mediaPlayerState.isPaused() ) { |
283 | setToggleButton( i, TRUE ); | 283 | setToggleButton( buttons[ i ], TRUE ); |
284 | mediaPlayerState.setPaused( TRUE ); | 284 | mediaPlayerState.setPaused( TRUE ); |
285 | return; | 285 | return; |
286 | } else { | 286 | } else { |
287 | return; | 287 | return; |
288 | } | 288 | } |
289 | } | 289 | } |
@@ -420,14 +420,14 @@ void VideoWidget::keyReleaseEvent( QKeyEvent *e) { | |||
420 | XineVideoWidget* VideoWidget::vidWidget() { | 420 | XineVideoWidget* VideoWidget::vidWidget() { |
421 | return videoFrame; | 421 | return videoFrame; |
422 | } | 422 | } |
423 | 423 | ||
424 | 424 | ||
425 | void VideoWidget::setFullscreen ( bool b ) { | 425 | void VideoWidget::setFullscreen ( bool b ) { |
426 | setToggleButton( VideoFullscreen, b ); | 426 | setToggleButton( buttons[ VideoFullscreen ], b ); |
427 | } | 427 | } |
428 | 428 | ||
429 | 429 | ||
430 | void VideoWidget::setPlaying( bool b) { | 430 | void VideoWidget::setPlaying( bool b) { |
431 | setToggleButton( VideoPlay, b ); | 431 | setToggleButton( buttons[ VideoPlay ], b ); |
432 | } | 432 | } |
433 | 433 | ||