summaryrefslogtreecommitdiff
path: root/core/multimedia/opieplayer/audiowidget.cpp
Unidiff
Diffstat (limited to 'core/multimedia/opieplayer/audiowidget.cpp') (more/less context) (show whitespace changes)
-rw-r--r--core/multimedia/opieplayer/audiowidget.cpp35
1 files changed, 26 insertions, 9 deletions
diff --git a/core/multimedia/opieplayer/audiowidget.cpp b/core/multimedia/opieplayer/audiowidget.cpp
index d20d560..ef7c8dc 100644
--- a/core/multimedia/opieplayer/audiowidget.cpp
+++ b/core/multimedia/opieplayer/audiowidget.cpp
@@ -148,3 +148,3 @@ AudioWidget::AudioWidget(QWidget* parent, const char* name, WFlags f) :
148 connect( mediaPlayerState, SIGNAL( loopingToggled(bool) ), this, SLOT( setLooping(bool) ) ); 148 connect( mediaPlayerState, SIGNAL( loopingToggled(bool) ), this, SLOT( setLooping(bool) ) );
149 connect( mediaPlayerState, SIGNAL( pausedToggled(bool) ), this, SLOT( setPaused(bool) ) ); 149// connect( mediaPlayerState, SIGNAL( pausedToggled(bool) ), this, SLOT( setPaused(bool) ) );
150 connect( mediaPlayerState, SIGNAL( playingToggled(bool) ), this, SLOT( setPlaying(bool) ) ); 150 connect( mediaPlayerState, SIGNAL( playingToggled(bool) ), this, SLOT( setPlaying(bool) ) );
@@ -155,3 +155,3 @@ AudioWidget::AudioWidget(QWidget* parent, const char* name, WFlags f) :
155 setLooping( mediaPlayerState->fullscreen() ); 155 setLooping( mediaPlayerState->fullscreen() );
156 setPaused( mediaPlayerState->paused() ); 156// setPaused( mediaPlayerState->paused() );
157 setPlaying( mediaPlayerState->playing() ); 157 setPlaying( mediaPlayerState->playing() );
@@ -365,3 +365,12 @@ void AudioWidget::mouseMoveEvent( QMouseEvent *event ) {
365 return; 365 return;
366 case AudioVolumeDown: emit lessClicked(); return; 366 case AudioVolumeDown:
367 qDebug("less clicked");
368 emit lessClicked();
369 return;
370 case AudioForward:
371 emit forwardClicked();
372 return;
373 case AudioBack:
374 emit backClicked();
375 return;
367 } 376 }
@@ -377,5 +386,13 @@ void AudioWidget::mouseMoveEvent( QMouseEvent *event ) {
377 switch (i) { 386 switch (i) {
378 case AudioPlay: mediaPlayerState->setPlaying(audioButtons[i].isDown); return; 387 case AudioPlay:
388 if( mediaPlayerState->isPaused ) {
389 mediaPlayerState->setPaused( FALSE );
390 return;
391 } else if( !mediaPlayerState->isPaused ) {
392 mediaPlayerState->setPaused( TRUE );
393 return;
394 }
395// case AudioPlay: mediaPlayerState->setPlaying(audioButtons[i].isDown); return;
379 case AudioStop: mediaPlayerState->setPlaying(FALSE); return; 396 case AudioStop: mediaPlayerState->setPlaying(FALSE); return;
380 case AudioPause: mediaPlayerState->setPaused(audioButtons[i].isDown); return; 397// case AudioPause: mediaPlayerState->setPaused(audioButtons[i].isDown); return;
381 case AudioNext: mediaPlayerState->setNext(); return; 398 case AudioNext: mediaPlayerState->setNext(); return;
@@ -465,12 +482,12 @@ void AudioWidget::keyReleaseEvent( QKeyEvent *e)
465 case Key_Down: //volume 482 case Key_Down: //volume
466 toggleButton(6); 483// toggleButton(6);
467 emit lessClicked(); 484 emit lessClicked();
468 emit lessReleased(); 485 emit lessReleased();
469 toggleButton(6); 486// toggleButton(6);
470 break; 487 break;
471 case Key_Up: //volume 488 case Key_Up: //volume
472 toggleButton(5); 489// toggleButton(5);
473 emit moreClicked(); 490 emit moreClicked();
474 emit moreReleased(); 491 emit moreReleased();
475 toggleButton(5); 492// toggleButton(5);
476 break; 493 break;