[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    extragear/multimedia/amarok/src/engine/xine
From:       Mark Kretschmann <markey () web ! de>
Date:       2006-09-19 15:04:46
Message-ID: 1158678286.350777.21370.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 586419 by markey:

We've decided that fadeout on pause isn't very useful, so I'm removing it. Fadeout on stop stays.

CCBUG: 127316


 M  +5 -5      xine-engine.cpp  


--- trunk/extragear/multimedia/amarok/src/engine/xine/xine-engine.cpp #586418:586419
@@ -367,14 +367,14 @@
 void
 XineEngine::pause()
 {
-    if( xine_get_param( m_stream, XINE_PARAM_SPEED ) && state() != Engine::Paused )
+    if( xine_get_param( m_stream, XINE_PARAM_SPEED ) )
     {
-        s_outfader = new OutFader( this, false );
-        s_outfader->start();
-        ::usleep( 100 ); //to be sure engine state won't be changed before it is checked in fadeOut()
+        xine_set_param( m_stream, XINE_PARAM_SPEED, XINE_SPEED_PAUSE ); 
+        xine_set_param( m_stream, XINE_PARAM_AUDIO_CLOSE_DEVICE, 1);
         emit stateChanged( Engine::Paused );
-    } else if ( !m_fadeOutRunning ) {
 
+    } else {
+
         xine_set_param( m_stream, XINE_PARAM_SPEED, XINE_SPEED_NORMAL );
         emit stateChanged( Engine::Playing );
     }
[prev in list] [next in list] [prev in thread] [next in thread]