author | llornkcor <llornkcor> | 2002-08-15 21:18:17 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2002-08-15 21:18:17 (UTC) |
commit | 78fead876601c4218eda97ec1da95b01a70155cd (patch) (unidiff) | |
tree | edf21f7d3df75c88470fa511db1a3065a6adb9bc /noncore/multimedia/opieplayer2/audiowidget.cpp | |
parent | 8b6d28983e62dd26acfeb9cf7408e21f68558a16 (diff) | |
download | opie-78fead876601c4218eda97ec1da95b01a70155cd.zip opie-78fead876601c4218eda97ec1da95b01a70155cd.tar.gz opie-78fead876601c4218eda97ec1da95b01a70155cd.tar.bz2 |
fix cruft
Diffstat (limited to 'noncore/multimedia/opieplayer2/audiowidget.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/multimedia/opieplayer2/audiowidget.cpp | 26 |
1 files changed, 13 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 | |||
@@ -190,7 +190,7 @@ AudioWidget::AudioWidget(QWidget* parent, const char* name, WFlags f) : | |||
190 | connect( mediaPlayerState, SIGNAL( lengthChanged(long) ), this, SLOT( setLength(long) ) ); | 190 | connect( mediaPlayerState, SIGNAL( lengthChanged(long) ), this, SLOT( setLength(long) ) ); |
191 | connect( mediaPlayerState, SIGNAL( viewChanged(char) ), this, SLOT( setView(char) ) ); | 191 | connect( mediaPlayerState, SIGNAL( viewChanged(char) ), this, SLOT( setView(char) ) ); |
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) ) ); |
195 | 195 | ||
196 | connect( this, SIGNAL( forwardClicked() ), this, SLOT( skipFor() ) ); | 196 | connect( this, SIGNAL( forwardClicked() ), this, SLOT( skipFor() ) ); |
@@ -204,7 +204,7 @@ AudioWidget::AudioWidget(QWidget* parent, const char* name, WFlags f) : | |||
204 | setLength( mediaPlayerState->length() ); | 204 | setLength( mediaPlayerState->length() ); |
205 | setPosition( mediaPlayerState->position() ); | 205 | setPosition( mediaPlayerState->position() ); |
206 | setLooping( mediaPlayerState->fullscreen() ); | 206 | setLooping( mediaPlayerState->fullscreen() ); |
207 | setPaused( mediaPlayerState->paused() ); | 207 | // setPaused( mediaPlayerState->paused() ); |
208 | setPlaying( mediaPlayerState->playing() ); | 208 | setPlaying( mediaPlayerState->playing() ); |
209 | 209 | ||
210 | } | 210 | } |
@@ -359,6 +359,7 @@ void AudioWidget::updateSlider( long i, long max ) { | |||
359 | 359 | ||
360 | 360 | ||
361 | void AudioWidget::setToggleButton( int i, bool down ) { | 361 | void AudioWidget::setToggleButton( int i, bool down ) { |
362 | qDebug("setToggleButton %d", i); | ||
362 | if ( down != audioButtons[i].isDown ) { | 363 | if ( down != audioButtons[i].isDown ) { |
363 | toggleButton( i ); | 364 | toggleButton( i ); |
364 | } | 365 | } |
@@ -423,7 +424,6 @@ void AudioWidget::mouseMoveEvent( QMouseEvent *event ) { | |||
423 | if ( isOnButton && !audioButtons[i].isHeld ) { | 424 | if ( isOnButton && !audioButtons[i].isHeld ) { |
424 | audioButtons[i].isHeld = TRUE; | 425 | audioButtons[i].isHeld = TRUE; |
425 | toggleButton(i); | 426 | toggleButton(i); |
426 | |||
427 | switch (i) { | 427 | switch (i) { |
428 | case AudioVolumeUp: | 428 | case AudioVolumeUp: |
429 | emit moreClicked(); | 429 | emit moreClicked(); |
@@ -438,25 +438,25 @@ void AudioWidget::mouseMoveEvent( QMouseEvent *event ) { | |||
438 | emit backClicked(); | 438 | emit backClicked(); |
439 | return; | 439 | return; |
440 | } | 440 | } |
441 | } else if ( !isOnButton && audioButtons[i].isHeld ) { | ||
442 | audioButtons[i].isHeld = FALSE; | ||
443 | toggleButton(i); | ||
444 | } | 441 | } |
442 | else if ( !isOnButton && audioButtons[i].isHeld ) { | ||
443 | audioButtons[i].isHeld = FALSE; | ||
444 | toggleButton(i); | ||
445 | } | ||
445 | } else { | 446 | } else { |
446 | if ( audioButtons[i].isHeld ) { | 447 | if ( audioButtons[i].isHeld ) { |
447 | audioButtons[i].isHeld = FALSE; | 448 | audioButtons[i].isHeld = FALSE; |
448 | if ( !audioButtons[i].isToggle ) { | 449 | if ( !audioButtons[i].isToggle ) { |
449 | setToggleButton( i, FALSE ); | 450 | setToggleButton( i, FALSE ); |
450 | qDebug("button toggled3 %d",i); | ||
451 | } | 451 | } |
452 | switch (i) { | 452 | switch (i) { |
453 | case AudioPlay: | 453 | case AudioPlay: |
454 | if( mediaPlayerState->isPaused ) { | 454 | if( mediaPlayerState->isPaused ) { |
455 | setToggleButton( i, FALSE ); | 455 | // setToggleButton( i, FALSE ); |
456 | mediaPlayerState->setPaused( FALSE ); | 456 | mediaPlayerState->setPaused( FALSE ); |
457 | return; | 457 | return; |
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 ); |
461 | return; | 461 | return; |
462 | } else { | 462 | } else { |
@@ -549,16 +549,16 @@ void AudioWidget::keyReleaseEvent( QKeyEvent *e) | |||
549 | } | 549 | } |
550 | break; | 550 | break; |
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; |
563 | case Key_Right: | 563 | case Key_Right: |
564 | // toggleButton(3); | 564 | // toggleButton(3); |