2 files changed, 21 insertions, 1 deletions

diff --git a/noncore/multimedia/opieplayer2/audiowidget.cpp b/noncore/multimedia/opieplayer2/audiowidget.cpp
index 132a911..442864f 100644
--- a/noncore/multimedia/opieplayer2/audiowidget.cpp
+++ b/noncore/multimedia/opieplayer2/audiowidget.cpp
@@ -304,48 +304,49 @@ void AudioWidget::setView( char view ) {
 // this isnt working for some reason
 
     if ( mediaPlayerState->streaming() ) {
         qDebug("<<<<<<<<<<<<<<file is STREAMING>>>>>>>>>>>>>>>>>>>");
         if( !slider.isHidden()) {
             slider.hide();
         }
         disconnect( mediaPlayerState, SIGNAL( positionChanged(long) ),this, SLOT( setPosition(long) ) );
         disconnect( mediaPlayerState, SIGNAL( positionUpdated(long) ),this, SLOT( setPosition(long) ) );
     } else {
         // this stops the slider from being moved, thus
         // does not stop stream when it reaches the end
         slider.show();
         connect( mediaPlayerState, SIGNAL( positionChanged(long) ),this, SLOT( setPosition(long) ) );
         connect( mediaPlayerState, SIGNAL( positionUpdated(long) ),this, SLOT( setPosition(long) ) );
     }
 
     if ( view == 'a' ) {
         // startTimer( 150 );
         showMaximized();
     } else {
         killTimers();
         hide();
     }
+    qApp->processEvents();
 }
 
 
 static QString timeAsString( long length ) {
     int minutes = length / 60;
     int seconds = length % 60;
     return QString("%1:%2%3").arg( minutes ).arg( seconds / 10 ).arg( seconds % 10 );
 }
 
 void AudioWidget::updateSlider( long i, long max ) {
 
     time.setText( timeAsString( i ) + " / " + timeAsString( max ) );
 //    qDebug( timeAsString( i ) + " / " + timeAsString( max ) ) ;
 
     if ( max == 0 ) {
         return;
     }
     // Will flicker too much if we don't do this
     // Scale to something reasonable
     int width = slider.width();
     int val = int((double)i * width / max);
     if ( !audioSliderBeingMoved ) {
         if ( slider.value() != val ) {
             slider.setValue( val );
@@ -549,29 +550,39 @@ void AudioWidget::keyReleaseEvent( QKeyEvent *e)
       }
           break;
       case Key_Down:
 //              toggleButton(6);
           emit lessClicked();
           emit lessReleased();
 //          toggleButton(6);
           break;
       case Key_Up:
 //             toggleButton(5);
            emit moreClicked();
            emit moreReleased();
 //             toggleButton(5);
            break;
       case Key_Right:
 //            toggleButton(3);
           mediaPlayerState->setNext();
 //            toggleButton(3);
           break;
       case Key_Left:
 //            toggleButton(4);
           mediaPlayerState->setPrev();
 //            toggleButton(4);
           break;
-      case Key_Escape:
+      case Key_Escape: {
+#if defined(QT_QWS_IPAQ)
+          if( mediaPlayerState->isPaused ) {
+              setToggleButton( i, FALSE );
+              mediaPlayerState->setPaused( FALSE );
+          } else if( !mediaPlayerState->isPaused ) {
+              setToggleButton( i, TRUE );
+              mediaPlayerState->setPaused( TRUE );
+          }           
+#endif
+      }
           break;
 
     };
 }
diff --git a/noncore/multimedia/opieplayer2/videowidget.cpp b/noncore/multimedia/opieplayer2/videowidget.cpp
index 0521419..5a69bf5 100644
--- a/noncore/multimedia/opieplayer2/videowidget.cpp
+++ b/noncore/multimedia/opieplayer2/videowidget.cpp
@@ -457,43 +457,52 @@ void VideoWidget::keyReleaseEvent( QKeyEvent *e) {
           } else {
               mediaPlayerState->setPlaying(TRUE);
           }
       }
           break;
       case Key_Down:
 //            toggleButton(6);
             emit lessClicked();
             emit lessReleased();
 //            toggleButton(6);
           break;
       case Key_Up:
 //             toggleButton(5);
              emit moreClicked();
              emit moreReleased();
 //             toggleButton(5);
            break;
       case Key_Right:
           mediaPlayerState->setNext();
           break;
       case Key_Left:
           mediaPlayerState->setPrev();
           break;
       case Key_Escape:
+#if defined(QT_QWS_IPAQ)
+          if( mediaPlayerState->isPaused ) {
+              setToggleButton( i, FALSE );
+              mediaPlayerState->setPaused( FALSE );
+          } else if( !mediaPlayerState->isPaused ) {
+              setToggleButton( i, TRUE );
+              mediaPlayerState->setPaused( TRUE );
+          }           
+#endif
           break;
 
     };
 }
 
 XineVideoWidget* VideoWidget::vidWidget() {
     return videoFrame;
 }
 
 
 void VideoWidget::setFullscreen ( bool b ) {
   setToggleButton( VideoFullscreen, b );
 }
 
 
 void VideoWidget::setPlaying( bool b) {
       setToggleButton( VideoPlay, b );
 }