author | harlekin <harlekin> | 2002-10-01 15:36:31 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2002-10-01 15:36:31 (UTC) |
commit | 657eeb18141838eeb0d18351a6755d7fa686f9d9 (patch) (unidiff) | |
tree | 049c19f776543aee296ce0cd3a1fde8c37ec374b /noncore/multimedia/opieplayer2/audiowidget.cpp | |
parent | bba0335bbea81519beafb7fec1979a0abbd8a7ea (diff) | |
download | opie-657eeb18141838eeb0d18351a6755d7fa686f9d9.zip opie-657eeb18141838eeb0d18351a6755d7fa686f9d9.tar.gz opie-657eeb18141838eeb0d18351a6755d7fa686f9d9.tar.bz2 |
mediadetect no longer needed, also beginning of id3 etc tag info support along with some other small fixes
Diffstat (limited to 'noncore/multimedia/opieplayer2/audiowidget.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/multimedia/opieplayer2/audiowidget.cpp | 25 |
1 files changed, 4 insertions, 21 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 | |||
@@ -58,7 +58,7 @@ static const int yo = 22; // movable y offset | |||
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() { |
@@ -460,20 +460,15 @@ void AudioWidget::mouseMoveEvent( QMouseEvent *event ) { | |||
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; |
@@ -508,7 +503,7 @@ void AudioWidget::closeEvent( QCloseEvent* ) { | |||
508 | } | 503 | } |
509 | 504 | ||
510 | 505 | ||
511 | void AudioWidget::paintEvent( QPaintEvent * pe) { | 506 | void AudioWidget::paintEvent( QPaintEvent * pe ) { |
512 | if ( !pe->erased() ) { | 507 | if ( !pe->erased() ) { |
513 | // Combine with background and double buffer | 508 | // Combine with background and double buffer |
514 | QPixmap pix( pe->rect().size() ); | 509 | QPixmap pix( pe->rect().size() ); |
@@ -580,18 +575,6 @@ void AudioWidget::keyReleaseEvent( QKeyEvent *e) { | |||
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 | ||