From kde-commits  Fri Jan 25 16:46:55 2008
From: Jens Bache-Wiig <jbache () trolltech ! com>
Date: Fri, 25 Jan 2008 16:46:55 +0000
To: kde-commits
Subject: kdereview/phonon/gstreamer
Message-Id: <1201279615.498841.18854.nullmailer () svn ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=120127978222439

SVN commit 766350 by jbache:

Fixes broken queue behavior.



 M  +3 -3      mediaobject.cpp  


--- trunk/kdereview/phonon/gstreamer/mediaobject.cpp #766349:766350
@@ -571,6 +571,8 @@
 
 void MediaObject::setNextSource(const MediaSource &source)
 {
+    if (source.type() == MediaSource::Invalid)
+        return;
     m_nextSource = source;
 }
 
@@ -662,6 +664,7 @@
     if (gst_element_set_state(m_pipeline, GST_STATE_NULL) != GST_STATE_CHANGE_SUCCESS) {
         setError(tr("Unable to flush pipeline"));
     }
+    m_source = source;
     emit currentSourceChanged(m_source);
     m_previousTickTime = -1;
 
@@ -684,7 +687,6 @@
     m_bufferPercent = 0;
     m_prefinishMarkReachedNotEmitted = true;
     m_aboutToFinishEmitted = false;
-    m_source = source;
     m_hasAudio = false;
     m_videoStreamFound = false;
     setTotalTime(-1);
@@ -917,8 +919,6 @@
  */
 void MediaObject::beginPlay()
 {
-    if (m_nextSource.type() == MediaSource::Invalid)
-        return;
     setSource(m_nextSource);
     m_nextSource = MediaSource();
     play();