summaryrefslogtreecommitdiff
path: root/noncore
Unidiff
Diffstat (limited to 'noncore') (more/less context) (show whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/audiowidget.cpp22
-rw-r--r--noncore/multimedia/opieplayer2/audiowidget.h3
2 files changed, 12 insertions, 13 deletions
diff --git a/noncore/multimedia/opieplayer2/audiowidget.cpp b/noncore/multimedia/opieplayer2/audiowidget.cpp
index cc6187c..132a911 100644
--- a/noncore/multimedia/opieplayer2/audiowidget.cpp
+++ b/noncore/multimedia/opieplayer2/audiowidget.cpp
@@ -192,3 +192,3 @@ AudioWidget::AudioWidget(QWidget* parent, const char* name, WFlags f) :
192 connect( mediaPlayerState, SIGNAL( loopingToggled(bool) ), this, SLOT( setLooping(bool) ) ); 192 connect( mediaPlayerState, SIGNAL( loopingToggled(bool) ), this, SLOT( setLooping(bool) ) );
193 connect( mediaPlayerState, SIGNAL( pausedToggled(bool) ), this, SLOT( setPaused(bool) ) ); 193// connect( mediaPlayerState, SIGNAL( pausedToggled(bool) ), this, SLOT( setPaused(bool) ) );
194 connect( mediaPlayerState, SIGNAL( playingToggled(bool) ), this, SLOT( setPlaying(bool) ) ); 194 connect( mediaPlayerState, SIGNAL( playingToggled(bool) ), this, SLOT( setPlaying(bool) ) );
@@ -206,3 +206,3 @@ AudioWidget::AudioWidget(QWidget* parent, const char* name, WFlags f) :
206 setLooping( mediaPlayerState->fullscreen() ); 206 setLooping( mediaPlayerState->fullscreen() );
207 setPaused( mediaPlayerState->paused() ); 207// setPaused( mediaPlayerState->paused() );
208 setPlaying( mediaPlayerState->playing() ); 208 setPlaying( mediaPlayerState->playing() );
@@ -361,2 +361,3 @@ void AudioWidget::updateSlider( long i, long max ) {
361void AudioWidget::setToggleButton( int i, bool down ) { 361void AudioWidget::setToggleButton( int i, bool down ) {
362 qDebug("setToggleButton %d", i);
362 if ( down != audioButtons[i].isDown ) { 363 if ( down != audioButtons[i].isDown ) {
@@ -425,3 +426,2 @@ void AudioWidget::mouseMoveEvent( QMouseEvent *event ) {
425 toggleButton(i); 426 toggleButton(i);
426
427 switch (i) { 427 switch (i) {
@@ -440,3 +440,4 @@ void AudioWidget::mouseMoveEvent( QMouseEvent *event ) {
440 } 440 }
441 } else if ( !isOnButton && audioButtons[i].isHeld ) { 441 }
442 else if ( !isOnButton && audioButtons[i].isHeld ) {
442 audioButtons[i].isHeld = FALSE; 443 audioButtons[i].isHeld = FALSE;
@@ -449,3 +450,2 @@ void AudioWidget::mouseMoveEvent( QMouseEvent *event ) {
449 setToggleButton( i, FALSE ); 450 setToggleButton( i, FALSE );
450 qDebug("button toggled3 %d",i);
451 } 451 }
@@ -454,3 +454,3 @@ void AudioWidget::mouseMoveEvent( QMouseEvent *event ) {
454 if( mediaPlayerState->isPaused ) { 454 if( mediaPlayerState->isPaused ) {
455 setToggleButton( i, FALSE ); 455// setToggleButton( i, FALSE );
456 mediaPlayerState->setPaused( FALSE ); 456 mediaPlayerState->setPaused( FALSE );
@@ -458,3 +458,3 @@ void AudioWidget::mouseMoveEvent( QMouseEvent *event ) {
458 } else if( !mediaPlayerState->isPaused ) { 458 } else if( !mediaPlayerState->isPaused ) {
459 setToggleButton( i, TRUE ); 459// setToggleButton( i, TRUE );
460 mediaPlayerState->setPaused( TRUE ); 460 mediaPlayerState->setPaused( TRUE );
@@ -551,12 +551,12 @@ void AudioWidget::keyReleaseEvent( QKeyEvent *e)
551 case Key_Down: 551 case Key_Down:
552 toggleButton(6); 552// toggleButton(6);
553 emit lessClicked(); 553 emit lessClicked();
554 emit lessReleased(); 554 emit lessReleased();
555 toggleButton(6); 555// toggleButton(6);
556 break; 556 break;
557 case Key_Up: 557 case Key_Up:
558 toggleButton(5); 558// toggleButton(5);
559 emit moreClicked(); 559 emit moreClicked();
560 emit moreReleased(); 560 emit moreReleased();
561 toggleButton(5); 561// toggleButton(5);
562 break; 562 break;
diff --git a/noncore/multimedia/opieplayer2/audiowidget.h b/noncore/multimedia/opieplayer2/audiowidget.h
index 772d1d1..e7da6c5 100644
--- a/noncore/multimedia/opieplayer2/audiowidget.h
+++ b/noncore/multimedia/opieplayer2/audiowidget.h
@@ -51,3 +51,2 @@ enum AudioButtons {
51 AudioStop, 51 AudioStop,
52 AudioPause,
53 AudioNext, 52 AudioNext,
@@ -91,3 +90,3 @@ public slots:
91 void sliderReleased( ); 90 void sliderReleased( );
92 void setPaused( bool b) { setToggleButton( AudioPause, b ); } 91// void setPaused( bool b) { setToggleButton( AudioPause, b ); }
93 void setLooping( bool b) { setToggleButton( AudioLoop, b ); } 92 void setLooping( bool b) { setToggleButton( AudioLoop, b ); }