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

List:       kde-commits
Subject:    extragear/multimedia/amarok/src
From:       Daniel Caleb Jones <danielcjones () gmail ! com>
Date:       2008-08-22 4:34:15
Message-ID: 1219379655.686107.7135.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 850712 by djones:

Revert that last one. It's not quite that simple it seems.


 M  +2 -9      EngineController.cpp  
 M  +0 -1      EngineController.h  


--- trunk/extragear/multimedia/amarok/src/EngineController.cpp #850711:850712
@@ -62,9 +62,8 @@
 EngineController::EngineController()
     : m_media( 0 )
     , m_audio( 0 )
-    , m_playWhenFetched( true )
+    , m_playWhenFetched(true)
     , m_fadeoutTimer( new QTimer( this ) )
-    , m_trackChangeInProgress( false )
 {
     DEBUG_BLOCK
 
@@ -482,8 +481,6 @@
     {
         play( track );
     }
-
-    m_trackChangeInProgress = false;
 }
 
 
@@ -543,13 +540,11 @@
 EngineController::slotAboutToFinish()
 {
     // For some reason, phonon emits this when it's done buffering.
-    if( m_trackChangeInProgress || m_media->state() == Phonon::BufferingState )
+    if( m_media->state() == Phonon::BufferingState )
         return;
 
     DEBUG_BLOCK
 
-    m_trackChangeInProgress = true;
-
     if( m_multi )
     {
         m_mutex.lock();
@@ -656,8 +651,6 @@
         playUrl( url, 0 );
         m_mutex.unlock();
     }
-
-    m_trackChangeInProgress = false;
 }
 
 void
--- trunk/extragear/multimedia/amarok/src/EngineController.h #850711:850712
@@ -145,7 +145,6 @@
     QTimer* m_fadeoutTimer;
 
     QMutex m_mutex;
-    bool m_trackChangeInProgress;
 };
 
 namespace The {
[prev in list] [next in list] [prev in thread] [next in thread]