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
@@ -187,13 +187,13 @@ AudioWidget::AudioWidget(QWidget* parent, const char* name, WFlags f) :
     connect( &slider,           SIGNAL( sliderPressed() ),      this, SLOT( sliderPressed() ) );
     connect( &slider,           SIGNAL( sliderReleased() ),     this, SLOT( sliderReleased() ) );
 
     connect( mediaPlayerState, SIGNAL( lengthChanged(long) ),  this, SLOT( setLength(long) ) );
     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) ) );
 
     connect( this,  SIGNAL( forwardClicked() ), this, SLOT( skipFor() ) );
     connect( this,  SIGNAL( backClicked() ),  this, SLOT( skipBack() ) );
     connect( this,  SIGNAL( forwardReleased() ), this, SLOT( stopSkip() ) );
     connect( this,  SIGNAL( backReleased() ), this, SLOT( stopSkip() ) );
@@ -201,13 +201,13 @@ AudioWidget::AudioWidget(QWidget* parent, const char* name, WFlags f) :
 
 
     // Intialise state
     setLength( mediaPlayerState->length() );
     setPosition( mediaPlayerState->position() );
     setLooping( mediaPlayerState->fullscreen() );
-    setPaused( mediaPlayerState->paused() );
+//    setPaused( mediaPlayerState->paused() );
     setPlaying( mediaPlayerState->playing() );
 
 }
 
 AudioWidget::~AudioWidget() {
 
@@ -356,12 +356,13 @@ 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 );
     }
 }
 
 
@@ -420,13 +421,12 @@ void AudioWidget::mouseMoveEvent( QMouseEvent *event ) {
                                 && y < imgButtonMask->height()
                                 && imgButtonMask->pixelIndex( x, y ) == i + 1 );
 
             if ( isOnButton && !audioButtons[i].isHeld ) {
                 audioButtons[i].isHeld = TRUE;
                 toggleButton(i);
-
                 switch (i) {
                 case AudioVolumeUp:
                     emit moreClicked();
                     return;
                 case AudioVolumeDown:
                     emit lessClicked();
@@ -435,31 +435,31 @@ void AudioWidget::mouseMoveEvent( QMouseEvent *event ) {
                     emit forwardClicked();
                     return;
                 case AudioBack:
                     emit backClicked();
                     return;
                 }
-            } else if ( !isOnButton && audioButtons[i].isHeld ) {
+            }
+              else if ( !isOnButton && audioButtons[i].isHeld ) {
                 audioButtons[i].isHeld = FALSE;
                 toggleButton(i);
             }
         } else {
             if ( audioButtons[i].isHeld ) {
                 audioButtons[i].isHeld = FALSE;
                 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;
                     } else {
                         //  setToggleButton( i, TRUE );
                         // mediaPlayerState->setPlaying( videoButtons[i].isDown );
                     }
@@ -546,22 +546,22 @@ void AudioWidget::keyReleaseEvent( QKeyEvent *e)
               mediaPlayerState->setPlaying(TRUE);
 //                toggleButton(0);
           }
       }
           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:
 //            toggleButton(3);
           mediaPlayerState->setNext();
 //            toggleButton(3);
           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
@@ -46,13 +46,12 @@
 
 class QPixmap;
 
 enum AudioButtons {
     AudioPlay=0,
     AudioStop,
-    AudioPause,
     AudioNext,
     AudioPrevious,
     AudioVolumeUp,
     AudioVolumeDown,
     AudioLoop,
     AudioPlayList,
@@ -86,13 +85,13 @@ public:
     void setTickerText( const QString &text ) { songInfo.setText( text ); }
     bool isStreaming;
 public slots:
     void updateSlider( long, long );
     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 ); }
     void setPosition( long );
     void setLength( long );
     void setView( char );