Fix script rendering dialog requesting existing file: http://kdenlive.org/mantis...

[kdenlive] / src / renderer.cpp

diff --git a/src/renderer.cpp b/src/renderer.cpp
index ca7f0d82d3b71f6c1b08e056cf7e6afed8198397..a821dbbfc5505d1952f45333a13bd95a11c6381b 100644 (file)
--- a/src/renderer.cpp
+++ b/src/renderer.cpp
@@ -431,7 +431,7 @@ void Render::seek(int time)
            m_mltConsumer->set("refresh", 1);
            m_paused = false;
        }
-       else if (m_mltProducer->get_speed() == 0) {
+       else if (m_winid != 0 && m_mltProducer->get_speed() == 0) {
            // workaround specific bug in MLT's SDL consumer
            m_mltConsumer->stop();
            m_mltConsumer->start();
@@ -1562,8 +1562,9 @@ void Render::stop()
     m_refreshTimer.stop();
     QMutexLocker locker(&m_mutex);
     if (m_mltProducer == NULL) return;
-    if (m_mltConsumer && !m_mltConsumer->is_stopped()) {
-        m_mltConsumer->stop();
+    if (m_mltConsumer) {
+       m_mltConsumer->set("refresh", 0);
+        if (!m_mltConsumer->is_stopped()) m_mltConsumer->stop();
         m_mltConsumer->purge();
     }
 
@@ -1615,7 +1616,18 @@ void Render::switchPlay(bool play)
         m_mltConsumer->set("refresh", 1);
     } else if (!play) {
        m_paused = true;
-       m_mltProducer->set_speed(0.0);
+       if (m_winid == 0) {
+           // OpenGL consumer
+           m_mltProducer->set_speed(0.0);
+       }
+       else {
+           // SDL consumer, hack to allow pausing near the end of the playlist
+           m_mltConsumer->set("refresh", 0);
+           m_mltConsumer->stop();
+           m_mltProducer->set_speed(0.0);
+           m_mltProducer->seek(m_mltConsumer->position());
+           m_mltConsumer->start();
+       }
     }
 }