Don't seek to start when playing a clip until the end. Instead, seek to start when...

svn path=/trunk/kdenlive/; revision=4288

diff --git a/src/monitor.cpp b/src/monitor.cpp
index b366f6d4a92bca7446f6bf3f26e18beee57c6a4b..0bf6bc3e1efab46d2b1c87daf75942b3bb6c8a44 100644 (file)
--- a/src/monitor.cpp
+++ b/src/monitor.cpp
@@ -639,13 +639,6 @@ void Monitor::seekCursor(int pos)
 
 void Monitor::rendererStopped(int pos)
 {
-    if (m_currentClip != NULL && m_playAction->isChecked()) {
-        // Clip monitor
-        if (m_isActive && pos >= m_length - 1) {
-            slotStart();
-            return;
-        }
-    }
     if (m_ruler->slotNewValue(pos)) {
         checkOverlay();
         if (m_frametimecode) m_timePos->setText(QString::number(pos));

diff --git a/src/renderer.cpp b/src/renderer.cpp
index 1de1ed5cdc2d9a591586efca5aa027b58678b60d..6eb6b50c47258aef977a1027a37e4a3885f8f980 100644 (file)
--- a/src/renderer.cpp
+++ b/src/renderer.cpp
@@ -1277,6 +1277,7 @@ void Render::switchPlay()
     if (m_isZoneMode) resetZoneMode();
     if (m_mltProducer->get_speed() == 0.0) {
         m_isBlocked = false;
+        if (m_name == "clip" && m_framePosition == (int) m_mltProducer->get_out()) m_mltProducer->seek(0);
         m_mltProducer->set_speed(1.0);
         m_mltConsumer->set("refresh", 1);
     } else {