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

List:       kde-commits
Subject:    kdeextragear-2/kmplayer/src
From:       Koos Vriezen <koos.vriezen () xs4all ! nl>
Date:       2003-12-08 21:48:13
[Download RAW message or body]

CVS commit by vriezen: 

Fix mrl dereferencing again


  M +11 -6     kmplayerprocess.cpp   1.40


--- kdeextragear-2/kmplayer/src/kmplayerprocess.cpp  #1.39:1.40
@@ -218,5 +218,5 @@ bool MPlayer::play () {
     source ()->setPosition (0);
     QString args = source ()->options () + ' ';
-    const KURL & url (source ()->url ());
+    const KURL & url = m_source->url ();
     if (!url.isEmpty ()) {
         QString myurl (url.isLocalFile () ? url.path () : url.url ());
@@ -492,8 +492,11 @@ void MPlayer::processStopped (KProcess *
             m_tmpURL.truncate (0);
         }
-        if (m_urls.count () > 0) {
+        while (m_urls.count () > 0) {
             QString url = m_urls.front ();
             m_urls.pop_front ();
+            if (m_source->url () == url)
+                continue;
             source ()->setURL (KURL (url));
+            break;
         }
         source ()->setIdentified ();
@@ -781,13 +784,15 @@ bool Xine::stop () {
 void Xine::setFinished () {
     kdDebug () << "Xine::finished () " << m_urls.count () << endl;
-    if (m_urls.count ()) {
+    while (m_urls.count ()) {
         QString url = m_urls.front ();
         m_urls.pop_front ();
-        //m_source->setURL (KURL (url));
+        if (m_source->url ().url () == url)
+            continue;
+        m_source->setURL (KURL (url));
         m_backend->setURL (url);
         m_backend->play ();
-    } else {
-        stop ();
+        return;
     }
+    stop ();
 }
 


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