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

List:       kde-commits
Subject:    extragear/multimedia/amarok
From:       Alexandre Pereira de Oliveira <aoliveira () kdemail ! net>
Date:       2006-10-28 21:37:36
Message-ID: 1162071456.113484.7713.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 599865 by aoliveira:

Amarok won't crossfade if it was paused, and user started another track. 
One more patch by Tuomas Nurmi <tnurmi@edu.kauhajoki.fi>
BUG:  136428)


 M  +2 -0      ChangeLog  
 M  +1 -0      src/engine/xine/xine-engine.cpp  


--- trunk/extragear/multimedia/amarok/ChangeLog #599864:599865
@@ -7,6 +7,8 @@
     * Support for %composer and %genre when guessing tags from filenames.
 
   CHANGES:
+    * Amarok won't crossfade if it was paused, and user started another
+      track. (BR 136428)
     * Amarok now saves playlists with relative paths by default.
 
   BUGFIXES:
--- trunk/extragear/multimedia/amarok/src/engine/xine/xine-engine.cpp #599864:599865
@@ -217,6 +217,7 @@
     Engine::Base::load( url, isStream );
 
     if( m_xfadeLength > 0 && xine_get_status( m_stream ) == XINE_STATUS_PLAY &&
+         xine_get_param( m_stream, XINE_PARAM_SPEED ) != XINE_SPEED_PAUSE &&
         ( m_xfadeNextTrack || //set by engine controller when switching tracks automatically
          (uint) AmarokConfig::crossfadeType() == 0 ||  //crossfade always
          (uint) AmarokConfig::crossfadeType() == 2 ) ) //crossfade when switching tracks manually
[prev in list] [next in list] [prev in thread] [next in thread]