fix cruft

2 files changed, 14 insertions, 15 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
@@ -191,5 +191,5 @@ AudioWidget::AudioWidget(QWidget* parent, const char* name, WFlags f) :
     connect( mediaPlayerState, SIGNAL( viewChanged(char) ),    this, SLOT( setView(char) ) );
     connect( mediaPlayerState, SIGNAL( loopingToggled(bool) ), this, SLOT( setLooping(bool) ) );
-    connect( mediaPlayerState, SIGNAL( pausedToggled(bool) ),  this, SLOT( setPaused(bool) ) );
+//    connect( mediaPlayerState, SIGNAL( pausedToggled(bool) ),  this, SLOT( setPaused(bool) ) );
     connect( mediaPlayerState, SIGNAL( playingToggled(bool) ), this, SLOT( setPlaying(bool) ) );
 
@@ -205,5 +205,5 @@ AudioWidget::AudioWidget(QWidget* parent, const char* name, WFlags f) :
     setPosition( mediaPlayerState->position() );
     setLooping( mediaPlayerState->fullscreen() );
-    setPaused( mediaPlayerState->paused() );
+//    setPaused( mediaPlayerState->paused() );
     setPlaying( mediaPlayerState->playing() );
 
@@ -360,4 +360,5 @@ void AudioWidget::updateSlider( long i, long max ) {
 
 void AudioWidget::setToggleButton( int i, bool down ) {
+    qDebug("setToggleButton %d", i);
     if ( down != audioButtons[i].isDown ) {
         toggleButton( i );
@@ -424,5 +425,4 @@ void AudioWidget::mouseMoveEvent( QMouseEvent *event ) {
                 audioButtons[i].isHeld = TRUE;
                 toggleButton(i);
-
                 switch (i) {
                 case AudioVolumeUp:
@@ -439,8 +439,9 @@ void AudioWidget::mouseMoveEvent( QMouseEvent *event ) {
                     return;
                 }
-            } else if ( !isOnButton && audioButtons[i].isHeld ) {
-                audioButtons[i].isHeld = FALSE;
-                toggleButton(i);
             }
+              else if ( !isOnButton && audioButtons[i].isHeld ) {
+                  audioButtons[i].isHeld = FALSE;
+                  toggleButton(i);
+              }
         } else {
             if ( audioButtons[i].isHeld ) {
@@ -448,14 +449,13 @@ void AudioWidget::mouseMoveEvent( QMouseEvent *event ) {
                 if ( !audioButtons[i].isToggle ) {
                     setToggleButton( i, FALSE );
-                    qDebug("button toggled3  %d",i);
                 }
                 switch (i) {
                 case AudioPlay:
                     if( mediaPlayerState->isPaused ) {
-                        setToggleButton( i, FALSE );
+//                          setToggleButton( i, FALSE );
                         mediaPlayerState->setPaused( FALSE );
                         return;
                     } else if( !mediaPlayerState->isPaused ) {
-                        setToggleButton( i, TRUE );
+//                            setToggleButton( i, TRUE );
                         mediaPlayerState->setPaused( TRUE );
                         return;
@@ -550,14 +550,14 @@ void AudioWidget::keyReleaseEvent( QKeyEvent *e)
           break;
       case Key_Down:
-            toggleButton(6);
+//              toggleButton(6);
           emit lessClicked();
           emit lessReleased();
-          toggleButton(6);
+//          toggleButton(6);
           break;
       case Key_Up:
-           toggleButton(5);
+//             toggleButton(5);
            emit moreClicked();
            emit moreReleased();
-           toggleButton(5);
+//             toggleButton(5);
            break;
       case Key_Right:
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
@@ -50,5 +50,4 @@ enum AudioButtons {
     AudioPlay=0,
     AudioStop,
-    AudioPause,
     AudioNext,
     AudioPrevious,
@@ -90,5 +89,5 @@ public slots:
     void sliderPressed( );
     void sliderReleased( );
-    void setPaused( bool b)  { setToggleButton( AudioPause, b ); }
+//    void setPaused( bool b)  { setToggleButton( AudioPause, b ); }
     void setLooping( bool b) { setToggleButton( AudioLoop, b ); }
     void setPlaying( bool b) { setToggleButton( AudioPlay, b ); }