author | simon <simon> | 2002-12-02 14:23:06 (UTC) |
---|---|---|
committer | simon <simon> | 2002-12-02 14:23:06 (UTC) |
commit | 6440dfbca27a1716456c081ff1b1756616afc518 (patch) (unidiff) | |
tree | 54c35f1acd1e3b06ba9b6cedbabc76dbc6a4783d | |
parent | 8179c80f459eeee815aeb279f73df754ba303198 (diff) | |
download | opie-6440dfbca27a1716456c081ff1b1756616afc518.zip opie-6440dfbca27a1716456c081ff1b1756616afc518.tar.gz opie-6440dfbca27a1716456c081ff1b1756616afc518.tar.bz2 |
- use currentTab() instead of whichList()
-rw-r--r-- | noncore/multimedia/opieplayer2/audiowidget.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/noncore/multimedia/opieplayer2/audiowidget.cpp b/noncore/multimedia/opieplayer2/audiowidget.cpp index 7c2b007..5cdfbf2 100644 --- a/noncore/multimedia/opieplayer2/audiowidget.cpp +++ b/noncore/multimedia/opieplayer2/audiowidget.cpp | |||
@@ -418,50 +418,50 @@ void AudioWidget::mouseMoveEvent( QMouseEvent *event ) { | |||
418 | emit backClicked(); | 418 | emit backClicked(); |
419 | return; | 419 | return; |
420 | } | 420 | } |
421 | } else if ( !isOnButton && audioButtons[i].isHeld ) { | 421 | } else if ( !isOnButton && audioButtons[i].isHeld ) { |
422 | audioButtons[i].isHeld = FALSE; | 422 | audioButtons[i].isHeld = FALSE; |
423 | toggleButton(i); | 423 | toggleButton(i); |
424 | } | 424 | } |
425 | } else { | 425 | } else { |
426 | if ( audioButtons[i].isHeld ) { | 426 | if ( audioButtons[i].isHeld ) { |
427 | audioButtons[i].isHeld = FALSE; | 427 | audioButtons[i].isHeld = FALSE; |
428 | if ( !audioButtons[i].isToggle ) { | 428 | if ( !audioButtons[i].isToggle ) { |
429 | setToggleButton( i, FALSE ); | 429 | setToggleButton( i, FALSE ); |
430 | } | 430 | } |
431 | qDebug("mouseEvent %d", i); | 431 | qDebug("mouseEvent %d", i); |
432 | switch (i) { | 432 | switch (i) { |
433 | case AudioPlay: | 433 | case AudioPlay: |
434 | if( mediaPlayerState->isPaused() ) { | 434 | if( mediaPlayerState->isPaused() ) { |
435 | mediaPlayerState->setPaused( FALSE ); | 435 | mediaPlayerState->setPaused( FALSE ); |
436 | return; | 436 | return; |
437 | } else if( !mediaPlayerState->isPaused() ) { | 437 | } else if( !mediaPlayerState->isPaused() ) { |
438 | mediaPlayerState->setPaused( TRUE ); | 438 | mediaPlayerState->setPaused( TRUE ); |
439 | return; | 439 | return; |
440 | } | 440 | } |
441 | case AudioStop: mediaPlayerState->setPlaying(FALSE); return; | 441 | case AudioStop: mediaPlayerState->setPlaying(FALSE); return; |
442 | case AudioNext: if( playList->whichList() ==0 ) mediaPlayerState->setNext(); return; | 442 | case AudioNext: if( playList->currentTab() == PlayListWidget::CurrentPlayList ) mediaPlayerState->setNext(); return; |
443 | case AudioPrevious: if( playList->whichList() ==0 ) mediaPlayerState->setPrev(); return; | 443 | case AudioPrevious: if( playList->currentTab() == PlayListWidget::CurrentPlayList ) mediaPlayerState->setPrev(); return; |
444 | case AudioLoop: mediaPlayerState->setLooping(audioButtons[i].isDown); return; | 444 | case AudioLoop: mediaPlayerState->setLooping(audioButtons[i].isDown); return; |
445 | case AudioVolumeUp: emit moreReleased(); return; | 445 | case AudioVolumeUp: emit moreReleased(); return; |
446 | case AudioVolumeDown: emit lessReleased(); return; | 446 | case AudioVolumeDown: emit lessReleased(); return; |
447 | case AudioPlayList: mediaPlayerState->setList(); return; | 447 | case AudioPlayList: mediaPlayerState->setList(); return; |
448 | case AudioForward: emit forwardReleased(); return; | 448 | case AudioForward: emit forwardReleased(); return; |
449 | case AudioBack: emit backReleased(); return; | 449 | case AudioBack: emit backReleased(); return; |
450 | } | 450 | } |
451 | } | 451 | } |
452 | } | 452 | } |
453 | } | 453 | } |
454 | } | 454 | } |
455 | 455 | ||
456 | 456 | ||
457 | void AudioWidget::mousePressEvent( QMouseEvent *event ) { | 457 | void AudioWidget::mousePressEvent( QMouseEvent *event ) { |
458 | mouseMoveEvent( event ); | 458 | mouseMoveEvent( event ); |
459 | } | 459 | } |
460 | 460 | ||
461 | 461 | ||
462 | void AudioWidget::mouseReleaseEvent( QMouseEvent *event ) { | 462 | void AudioWidget::mouseReleaseEvent( QMouseEvent *event ) { |
463 | mouseMoveEvent( event ); | 463 | mouseMoveEvent( event ); |
464 | } | 464 | } |
465 | 465 | ||
466 | 466 | ||
467 | void AudioWidget::showEvent( QShowEvent* ) { | 467 | void AudioWidget::showEvent( QShowEvent* ) { |