Diffstat (limited to 'noncore/multimedia/opieplayer2/audiowidget.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/multimedia/opieplayer2/audiowidget.cpp | 30 |
1 files changed, 5 insertions, 25 deletions
diff --git a/noncore/multimedia/opieplayer2/audiowidget.cpp b/noncore/multimedia/opieplayer2/audiowidget.cpp index d9beb90..3070bc3 100644 --- a/noncore/multimedia/opieplayer2/audiowidget.cpp +++ b/noncore/multimedia/opieplayer2/audiowidget.cpp | |||
@@ -50,8 +50,6 @@ | |||
50 | #include "mediaplayerstate.h" | 50 | #include "mediaplayerstate.h" |
51 | #include "playlistwidget.h" | 51 | #include "playlistwidget.h" |
52 | 52 | ||
53 | extern PlayListWidget *playList; | ||
54 | |||
55 | static const int xo = -2; // movable x offset | 53 | static const int xo = -2; // movable x offset |
56 | static const int yo = 22; // movable y offset | 54 | static const int yo = 22; // movable y offset |
57 | 55 | ||
@@ -393,16 +391,16 @@ void AudioWidget::mouseMoveEvent( QMouseEvent *event ) { | |||
393 | audioButtons[i].isHeld = TRUE; | 391 | audioButtons[i].isHeld = TRUE; |
394 | toggleButton(i); | 392 | toggleButton(i); |
395 | switch (i) { | 393 | switch (i) { |
396 | case AudioVolumeUp: | 394 | case VolumeUp: |
397 | emit moreClicked(); | 395 | emit moreClicked(); |
398 | return; | 396 | return; |
399 | case AudioVolumeDown: | 397 | case VolumeDown: |
400 | emit lessClicked(); | 398 | emit lessClicked(); |
401 | return; | 399 | return; |
402 | case AudioForward: | 400 | case Forward: |
403 | emit forwardClicked(); | 401 | emit forwardClicked(); |
404 | return; | 402 | return; |
405 | case AudioBack: | 403 | case Back: |
406 | emit backClicked(); | 404 | emit backClicked(); |
407 | return; | 405 | return; |
408 | } | 406 | } |
@@ -417,25 +415,7 @@ void AudioWidget::mouseMoveEvent( QMouseEvent *event ) { | |||
417 | setToggleButton( i, FALSE ); | 415 | setToggleButton( i, FALSE ); |
418 | } | 416 | } |
419 | qDebug("mouseEvent %d", i); | 417 | qDebug("mouseEvent %d", i); |
420 | switch (i) { | 418 | handleCommand( static_cast<Command>( i ), audioButtons[ i ].isDown ); |
421 | case AudioPlay: | ||
422 | if( mediaPlayerState.isPaused() ) { | ||
423 | mediaPlayerState.setPaused( FALSE ); | ||
424 | return; | ||
425 | } else if( !mediaPlayerState.isPaused() ) { | ||
426 | mediaPlayerState.setPaused( TRUE ); | ||
427 | return; | ||
428 | } | ||
429 | case AudioStop: mediaPlayerState.setPlaying(FALSE); return; | ||
430 | case AudioNext: if( playList->currentTab() == PlayListWidget::CurrentPlayList ) mediaPlayerState.setNext(); return; | ||
431 | case AudioPrevious: if( playList->currentTab() == PlayListWidget::CurrentPlayList ) mediaPlayerState.setPrev(); return; | ||
432 | case AudioLoop: mediaPlayerState.setLooping(audioButtons[i].isDown); return; | ||
433 | case AudioVolumeUp: emit moreReleased(); return; | ||
434 | case AudioVolumeDown: emit lessReleased(); return; | ||
435 | case AudioPlayList: mediaPlayerState.setList(); return; | ||
436 | case AudioForward: emit forwardReleased(); return; | ||
437 | case AudioBack: emit backReleased(); return; | ||
438 | } | ||
439 | } | 419 | } |
440 | } | 420 | } |
441 | } | 421 | } |