- use xine_set_param( ..., XINE_PARAM_SPEED, with XINE_SPEED_PAUSE and

  XINE_SPEED_NORMAL to toggle between pause and playing state, instead of
  attempting to re-start the stream at the last position

3 files changed, 4 insertions, 8 deletions

diff --git a/noncore/multimedia/opieplayer2/lib.cpp b/noncore/multimedia/opieplayer2/lib.cpp
index 1b5fd51..9e818eb 100644
--- a/noncore/multimedia/opieplayer2/lib.cpp
+++ b/noncore/multimedia/opieplayer2/lib.cpp
@@ -171,8 +171,8 @@ void Lib::stop() {
     xine_stop( m_stream );
 }
 
-void Lib::pause() {
-    xine_set_param( m_stream, XINE_PARAM_SPEED,  XINE_SPEED_PAUSE );
+void Lib::pause( bool toggle ) {
+    xine_set_param( m_stream, XINE_PARAM_SPEED, toggle ? XINE_SPEED_PAUSE : XINE_SPEED_NORMAL );
 }
 
 int Lib::speed() const {
diff --git a/noncore/multimedia/opieplayer2/lib.h b/noncore/multimedia/opieplayer2/lib.h
index 3224cb9..37a4f9a 100644
--- a/noncore/multimedia/opieplayer2/lib.h
+++ b/noncore/multimedia/opieplayer2/lib.h
@@ -71,7 +71,7 @@ namespace XINE {
                   int startPos = 0,
                   int start_time = 0 );
         void stop();
-        void pause();
+        void pause( bool toggle );
 
         int speed() const;
 
diff --git a/noncore/multimedia/opieplayer2/xinecontrol.cpp b/noncore/multimedia/opieplayer2/xinecontrol.cpp
index 6f1cd9c..0e81fa2 100644
--- a/noncore/multimedia/opieplayer2/xinecontrol.cpp
+++ b/noncore/multimedia/opieplayer2/xinecontrol.cpp
@@ -144,11 +144,7 @@ void XineControl::stop( bool isSet ) {
  * @isSet
  */
 void XineControl::pause( bool isSet) {
-    if ( isSet ) {
-        libXine->pause();
-    } else {
-        libXine->play( m_fileName, 0, m_currentTime );
-    }
+    libXine->pause( isSet );
 }