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

List:       kde-commits
Subject:    extragear/multimedia/amarok/src
From:       Alex Merry <kde () randomguy3 ! me ! uk>
Date:       2008-08-30 20:34:40
Message-ID: 1220128480.194039.5316.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 854966 by alexmerry:

Zero out m_currentTrack when we're done.  The currentSourceChanged() signal from \
Phonon should cause it to be set again.

This should fix the problem where Phonon's state changing to StoppedState between \
tracks means EngineController listeners can't get at the current track pointer.



 M  +3 -3      EngineController.cpp  


--- trunk/extragear/multimedia/amarok/src/EngineController.cpp #854965:854966
@@ -350,6 +350,7 @@
         m_media->stop();
 
     emit trackFinished();
+    m_currentTrack = 0;
 }
 
 void
@@ -446,9 +447,7 @@
 Meta::TrackPtr
 EngineController::currentTrack() const
 {
-    // TODO: Should we be deleting m_currentTrack when we stop playback instead of \
                checking for it here?
-    Phonon::State state = m_media->state();
-    return state == ( Phonon::ErrorState || Phonon::StoppedState ) ? \
Meta::TrackPtr() : m_currentTrack; +    return m_currentTrack;
 }
 
 int
@@ -566,6 +565,7 @@
     {
         emit trackFinished();
         m_currentTrack->finishedPlaying( 1.0 );
+        m_currentTrack = 0;
     }
 
     m_mutex.lock(); // in case setNextTrack is being handled right now.


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