]> git.sesse.net Git - kdenlive/commitdiff
Fix recent regression in clip duration
authorJean-Baptiste Mardelle <jb@kdenlive.org>
Tue, 25 Oct 2011 20:00:50 +0000 (20:00 +0000)
committerJean-Baptiste Mardelle <jb@kdenlive.org>
Tue, 25 Oct 2011 20:00:50 +0000 (20:00 +0000)
svn path=/trunk/kdenlive/; revision=5991

src/docclipbase.cpp
src/renderer.cpp

index 5c06003c432b7a089ff8501fe75b8b691f2b4a11..adeb59c1fa4284fe14f1d921f8bfd57c7eb36421 100644 (file)
@@ -651,8 +651,8 @@ Mlt::Producer *DocClipBase::getCloneProducer()
         adjustProducerProperties(prod, getId() + "_", false, false);
         if (!m_properties.contains("proxy_out")) {
             // Adjust length in case...
-            prod->set("length", m_properties.value("duration").toInt());
-            prod->set("out", m_properties.value("out").toInt());
+            if (m_properties.contains("duration")) prod->set("length", m_properties.value("duration").toInt());
+            if (m_properties.contains("out"))prod->set("out", m_properties.value("out").toInt());
         }
     }
     return prod;
index 6c6f7804c423005e45011f89c16fb627aaaf8420..ee07e4c6e5327fd052687d1ce103e3fcc74c0d53 100644 (file)
@@ -1180,9 +1180,9 @@ int Render::setSceneList(QString playlist, int position)
     kDebug() << "// NEW SCENE LIST DURATION SET TO: " << m_mltProducer->get_playtime();
     m_mltConsumer->connect(*m_mltProducer);
     m_mltProducer->set_speed(0);
-    emit durationChanged(m_mltProducer->get_playtime());
     fillSlowMotionProducers();
     blockSignals(false);
+    emit durationChanged(m_mltProducer->get_playtime());
 
     return error;
     //kDebug()<<"// SETSCN LST, POS: "<<position;