Diffstat (limited to 'noncore/multimedia/opieplayer2/videowidget.cpp') (more/less context) (ignore 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 | |||
@@ -109,13 +109,13 @@ VideoWidget::VideoWidget( PlayListWidget &playList, MediaPlayerState &mediaPlaye | |||
109 | QImage imgMask = button.mask.convertToImage(); | 109 | QImage imgMask = button.mask.convertToImage(); |
110 | uchar **dest = buttonMask.jumpTable(); | 110 | uchar **dest = buttonMask.jumpTable(); |
111 | for ( int y = 0; y < imgUp.height(); y++ ) { | 111 | for ( int y = 0; y < imgUp.height(); y++ ) { |
112 | uchar *line = dest[y]; | 112 | uchar *line = dest[y]; |
113 | for ( int x = 0; x < imgUp.width(); x++ ) | 113 | for ( int x = 0; x < imgUp.width(); x++ ) |
114 | if ( !qRed( imgMask.pixel( x, y ) ) ) | 114 | if ( !qRed( imgMask.pixel( x, y ) ) ) |
115 | line[x] = i + 1; | 115 | line[x] = button.command + 1; |
116 | } | 116 | } |
117 | } | 117 | } |
118 | 118 | ||
119 | buttons.push_back( button ); | 119 | buttons.push_back( button ); |
120 | } | 120 | } |
121 | 121 | ||
@@ -244,28 +244,30 @@ void VideoWidget::updateSlider( long i, long max ) { | |||
244 | } | 244 | } |
245 | 245 | ||
246 | void VideoWidget::mouseMoveEvent( QMouseEvent *event ) { | 246 | void VideoWidget::mouseMoveEvent( QMouseEvent *event ) { |
247 | for ( unsigned int i = 0; i < buttons.size(); i++ ) { | 247 | for ( unsigned int i = 0; i < buttons.size(); i++ ) { |
248 | 248 | ||
249 | Button &button = buttons[ i ]; | 249 | Button &button = buttons[ i ]; |
250 | Command command = button.command; | ||
250 | 251 | ||
251 | if ( event->state() == QMouseEvent::LeftButton ) { | 252 | if ( event->state() == QMouseEvent::LeftButton ) { |
252 | // The test to see if the mouse click is inside the button or not | 253 | // The test to see if the mouse click is inside the button or not |
253 | bool isOnButton = isOverButton( event->pos() - upperLeftOfButtonMask, i ); | 254 | bool isOnButton = isOverButton( event->pos() - upperLeftOfButtonMask, command ); |
254 | 255 | ||
255 | if ( isOnButton && !button.isHeld ) { | 256 | if ( isOnButton && !button.isHeld ) { |
256 | button.isHeld = TRUE; | 257 | button.isHeld = TRUE; |
257 | toggleButton( button ); | 258 | toggleButton( button ); |
258 | 259 | ||
259 | switch (i) { | 260 | switch ( command ) { |
260 | case VideoVolUp: | 261 | case VolumeUp: |
261 | emit moreClicked(); | 262 | emit moreClicked(); |
262 | return; | 263 | return; |
263 | case VideoVolDown: | 264 | case VolumeDown: |
264 | emit lessClicked(); | 265 | emit lessClicked(); |
265 | return; | 266 | return; |
267 | default: break; | ||
266 | } | 268 | } |
267 | } else if ( !isOnButton && button.isHeld ) { | 269 | } else if ( !isOnButton && button.isHeld ) { |
268 | button.isHeld = FALSE; | 270 | button.isHeld = FALSE; |
269 | toggleButton( button ); | 271 | toggleButton( button ); |
270 | } | 272 | } |
271 | } else { | 273 | } else { |
@@ -273,15 +275,15 @@ void VideoWidget::mouseMoveEvent( QMouseEvent *event ) { | |||
273 | if ( button.isHeld ) { | 275 | if ( button.isHeld ) { |
274 | button.isHeld = FALSE; | 276 | button.isHeld = FALSE; |
275 | if ( button.type != ToggleButton ) { | 277 | if ( button.type != ToggleButton ) { |
276 | setToggleButton( button, FALSE ); | 278 | setToggleButton( button, FALSE ); |
277 | } | 279 | } |
278 | 280 | ||
279 | switch(i) { | 281 | switch( command ) { |
280 | 282 | ||
281 | case VideoPlay: { | 283 | case Play: { |
282 | if( mediaPlayerState.isPaused() ) { | 284 | if( mediaPlayerState.isPaused() ) { |
283 | setToggleButton( button, FALSE ); | 285 | setToggleButton( button, FALSE ); |
284 | mediaPlayerState.setPaused( FALSE ); | 286 | mediaPlayerState.setPaused( FALSE ); |
285 | return; | 287 | return; |
286 | } else if( !mediaPlayerState.isPaused() ) { | 288 | } else if( !mediaPlayerState.isPaused() ) { |
287 | setToggleButton( button, TRUE ); | 289 | setToggleButton( button, TRUE ); |
@@ -289,18 +291,19 @@ void VideoWidget::mouseMoveEvent( QMouseEvent *event ) { | |||
289 | return; | 291 | return; |
290 | } else { | 292 | } else { |
291 | return; | 293 | return; |
292 | } | 294 | } |
293 | } | 295 | } |
294 | 296 | ||
295 | case VideoStop: mediaPlayerState.setPlaying( FALSE ); return; | 297 | case Stop: mediaPlayerState.setPlaying( FALSE ); return; |
296 | case VideoNext: if( playList.currentTab() == PlayListWidget::CurrentPlayList ) mediaPlayerState.setNext(); return; | 298 | case Next: if( playList.currentTab() == PlayListWidget::CurrentPlayList ) mediaPlayerState.setNext(); return; |
297 | case VideoPrevious: if( playList.currentTab() == PlayListWidget::CurrentPlayList ) mediaPlayerState.setPrev(); return; | 299 | case Previous: if( playList.currentTab() == PlayListWidget::CurrentPlayList ) mediaPlayerState.setPrev(); return; |
298 | case VideoVolUp: emit moreReleased(); return; | 300 | case VolumeUp: emit moreReleased(); return; |
299 | case VideoVolDown: emit lessReleased(); return; | 301 | case VolumeDown: emit lessReleased(); return; |
300 | case VideoFullscreen: mediaPlayerState.setFullscreen( TRUE ); makeVisible(); return; | 302 | case FullScreen: mediaPlayerState.setFullscreen( TRUE ); makeVisible(); return; |
303 | default: break; | ||
301 | } | 304 | } |
302 | } | 305 | } |
303 | } | 306 | } |
304 | } | 307 | } |
305 | } | 308 | } |
306 | 309 | ||
@@ -424,14 +427,14 @@ void VideoWidget::keyReleaseEvent( QKeyEvent *e) { | |||
424 | XineVideoWidget* VideoWidget::vidWidget() { | 427 | XineVideoWidget* VideoWidget::vidWidget() { |
425 | return videoFrame; | 428 | return videoFrame; |
426 | } | 429 | } |
427 | 430 | ||
428 | 431 | ||
429 | void VideoWidget::setFullscreen ( bool b ) { | 432 | void VideoWidget::setFullscreen ( bool b ) { |
430 | setToggleButton( buttons[ VideoFullscreen ], b ); | 433 | setToggleButton( FullScreen, b ); |
431 | } | 434 | } |
432 | 435 | ||
433 | 436 | ||
434 | void VideoWidget::setPlaying( bool b) { | 437 | void VideoWidget::setPlaying( bool b) { |
435 | setToggleButton( buttons[ VideoPlay ], b ); | 438 | setToggleButton( Play, b ); |
436 | } | 439 | } |
437 | 440 | ||