Diffstat (limited to 'noncore/multimedia/opieplayer2/audiowidget.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/multimedia/opieplayer2/audiowidget.cpp | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/noncore/multimedia/opieplayer2/audiowidget.cpp b/noncore/multimedia/opieplayer2/audiowidget.cpp index 620c71f..a6fd334 100644 --- a/noncore/multimedia/opieplayer2/audiowidget.cpp +++ b/noncore/multimedia/opieplayer2/audiowidget.cpp | |||
@@ -49,25 +49,25 @@ | |||
49 | #include "mediaplayerstate.h" | 49 | #include "mediaplayerstate.h" |
50 | #include "playlistwidget.h" | 50 | #include "playlistwidget.h" |
51 | 51 | ||
52 | extern MediaPlayerState *mediaPlayerState; | 52 | extern MediaPlayerState *mediaPlayerState; |
53 | extern PlayListWidget *playList; | 53 | extern PlayListWidget *playList; |
54 | 54 | ||
55 | static const int xo = -2; // movable x offset | 55 | static const int xo = -2; // movable x offset |
56 | static const int yo = 22; // movable y offset | 56 | static const int yo = 22; // movable y offset |
57 | 57 | ||
58 | 58 | ||
59 | Ticker::Ticker( QWidget* parent=0 ) : QFrame( parent ) { | 59 | Ticker::Ticker( QWidget* parent=0 ) : QFrame( parent ) { |
60 | setFrameStyle( WinPanel | Sunken ); | 60 | setFrameStyle( WinPanel | Sunken ); |
61 | setText( "No Song" ); | 61 | //setText( "No Song" ); |
62 | } | 62 | } |
63 | 63 | ||
64 | Ticker::~Ticker() { | 64 | Ticker::~Ticker() { |
65 | } | 65 | } |
66 | 66 | ||
67 | void Ticker::setText( const QString& text ) { | 67 | void Ticker::setText( const QString& text ) { |
68 | pos = 0; // reset it everytime the text is changed | 68 | pos = 0; // reset it everytime the text is changed |
69 | scrollText = text; | 69 | scrollText = text; |
70 | pixelLen = fontMetrics().width( scrollText ); | 70 | pixelLen = fontMetrics().width( scrollText ); |
71 | killTimers(); | 71 | killTimers(); |
72 | if ( pixelLen > width() ) { | 72 | if ( pixelLen > width() ) { |
73 | startTimer( 50 ); | 73 | startTimer( 50 ); |
@@ -451,34 +451,29 @@ void AudioWidget::mouseMoveEvent( QMouseEvent *event ) { | |||
451 | toggleButton(i); | 451 | toggleButton(i); |
452 | } | 452 | } |
453 | } else { | 453 | } else { |
454 | if ( audioButtons[i].isHeld ) { | 454 | if ( audioButtons[i].isHeld ) { |
455 | audioButtons[i].isHeld = FALSE; | 455 | audioButtons[i].isHeld = FALSE; |
456 | if ( !audioButtons[i].isToggle ) { | 456 | if ( !audioButtons[i].isToggle ) { |
457 | setToggleButton( i, FALSE ); | 457 | setToggleButton( i, FALSE ); |
458 | } | 458 | } |
459 | qDebug("mouseEvent %d", i); | 459 | qDebug("mouseEvent %d", i); |
460 | switch (i) { | 460 | switch (i) { |
461 | case AudioPlay: | 461 | case AudioPlay: |
462 | if( mediaPlayerState->isPaused ) { | 462 | if( mediaPlayerState->isPaused ) { |
463 | // setToggleButton( i, FALSE ); | ||
464 | mediaPlayerState->setPaused( FALSE ); | 463 | mediaPlayerState->setPaused( FALSE ); |
465 | return; | 464 | return; |
466 | } else if( !mediaPlayerState->isPaused ) { | 465 | } else if( !mediaPlayerState->isPaused ) { |
467 | // setToggleButton( i, TRUE ); | ||
468 | mediaPlayerState->setPaused( TRUE ); | 466 | mediaPlayerState->setPaused( TRUE ); |
469 | return; | 467 | return; |
470 | } else { | ||
471 | // setToggleButton( i, TRUE ); | ||
472 | // mediaPlayerState->setPlaying( videoButtons[i].isDown ); | ||
473 | } | 468 | } |
474 | case AudioStop: mediaPlayerState->setPlaying(FALSE); return; | 469 | case AudioStop: mediaPlayerState->setPlaying(FALSE); return; |
475 | case AudioNext: if(playList->whichList() ==0) mediaPlayerState->setNext(); return; | 470 | case AudioNext: if(playList->whichList() ==0) mediaPlayerState->setNext(); return; |
476 | case AudioPrevious: if(playList->whichList() ==0) mediaPlayerState->setPrev(); return; | 471 | case AudioPrevious: if(playList->whichList() ==0) mediaPlayerState->setPrev(); return; |
477 | case AudioLoop: mediaPlayerState->setLooping(audioButtons[i].isDown); return; | 472 | case AudioLoop: mediaPlayerState->setLooping(audioButtons[i].isDown); return; |
478 | case AudioVolumeUp: emit moreReleased(); return; | 473 | case AudioVolumeUp: emit moreReleased(); return; |
479 | case AudioVolumeDown: emit lessReleased(); return; | 474 | case AudioVolumeDown: emit lessReleased(); return; |
480 | case AudioPlayList: mediaPlayerState->setList(); return; | 475 | case AudioPlayList: mediaPlayerState->setList(); return; |
481 | case AudioForward: emit forwardReleased(); return; | 476 | case AudioForward: emit forwardReleased(); return; |
482 | case AudioBack: emit backReleased(); return; | 477 | case AudioBack: emit backReleased(); return; |
483 | } | 478 | } |
484 | } | 479 | } |
@@ -571,29 +566,17 @@ void AudioWidget::keyReleaseEvent( QKeyEvent *e) { | |||
571 | break; | 566 | break; |
572 | case Key_Right: | 567 | case Key_Right: |
573 | // toggleButton(3); | 568 | // toggleButton(3); |
574 | mediaPlayerState->setNext(); | 569 | mediaPlayerState->setNext(); |
575 | // toggleButton(3); | 570 | // toggleButton(3); |
576 | break; | 571 | break; |
577 | case Key_Left: | 572 | case Key_Left: |
578 | // toggleButton(4); | 573 | // toggleButton(4); |
579 | mediaPlayerState->setPrev(); | 574 | mediaPlayerState->setPrev(); |
580 | // toggleButton(4); | 575 | // toggleButton(4); |
581 | break; | 576 | break; |
582 | case Key_Escape: { | 577 | case Key_Escape: { |
583 | /* | ||
584 | * author pleas tell me where the i come from .-) | ||
585 | #if defined(QT_QWS_IPAQ) | ||
586 | if( mediaPlayerState->isPaused ) { | ||
587 | setToggleButton( i, FALSE ); | ||
588 | mediaPlayerState->setPaused( FALSE ); | ||
589 | } else if( !mediaPlayerState->isPaused ) { | ||
590 | setToggleButton( i, TRUE ); | ||
591 | mediaPlayerState->setPaused( TRUE ); | ||
592 | } | ||
593 | #endif | ||
594 | */ | ||
595 | } | 578 | } |
596 | break; | 579 | break; |
597 | 580 | ||
598 | }; | 581 | }; |
599 | } | 582 | } |