Fix seeking after play zone:http://www.kdenlive.org/mantis/view.php?id=2876

[kdenlive] / src / renderer.cpp

diff --git a/src/renderer.cpp b/src/renderer.cpp
index 3826e933e24edd87714baa2dae2264ef0df8d656..70cf139d6770ae92924376b201d9cb8efeb4050c 100644 (file)
--- a/src/renderer.cpp
+++ b/src/renderer.cpp
@@ -116,7 +116,8 @@ Render::Render(Kdenlive::MONITORID rendererName, int winid, QString profile, QWi
     m_isLoopMode(false),
     m_isSplitView(false),
     m_blackClip(NULL),
-    m_winid(winid)
+    m_winid(winid),
+    m_paused(true)
 {
     qRegisterMetaType<stringMap> ("stringMap");
     analyseAudio = KdenliveSettings::monitor_audio();
@@ -385,19 +386,20 @@ int Render::resetProfile(const QString &profileName, bool dropSceneList)
 
 void Render::seek(GenTime time)
 {
+    if (!m_mltProducer)
+        return;
     int pos = time.frames(m_fps);
     seek(pos);
 }
 
 void Render::seek(int time)
 {
-    if (!m_mltProducer)
-        return;
+    resetZoneMode();
     if (requestedSeekPosition == SEEK_INACTIVE) {
        requestedSeekPosition = time;
        m_mltProducer->seek(time);
        //m_mltConsumer->purge();
-       if (m_mltProducer->get_speed() == 0) {
+       if (m_paused) {
            refresh();
        }
     }
@@ -1162,7 +1164,9 @@ int Render::setProducer(Mlt::Producer *producer, int position)
     }
     m_mltProducer = producer;
     m_mltProducer->set_speed(0);
-    if (monitorIsActive) startConsumer();
+    if (monitorIsActive) {
+       startConsumer();
+    }
     emit durationChanged(m_mltProducer->get_playtime());
     position = m_mltProducer->position();
     emit rendererPosition(position);
@@ -1535,11 +1539,11 @@ void Render::pause()
     requestedSeekPosition = SEEK_INACTIVE;
     if (!m_mltProducer || !m_mltConsumer)
         return;
-    if (m_mltProducer->get_speed() == 0.0) return;
-    if (m_isZoneMode) resetZoneMode();
-    m_mltConsumer->set("refresh", 0);
+    m_paused = true;
     m_mltProducer->set_speed(0.0);
-    m_mltConsumer->purge();
+    m_mltConsumer->set("refresh", 0);
+    if (!m_mltConsumer->is_stopped()) m_mltConsumer->stop();
+    m_mltProducer->seek(m_mltConsumer->position());
 }
 
 void Render::switchPlay(bool play)
@@ -1549,28 +1553,20 @@ void Render::switchPlay(bool play)
     if (!m_mltProducer || !m_mltConsumer)
         return;
     if (m_isZoneMode) resetZoneMode();
-    if (play && m_mltProducer->get_speed() == 0.0) {
+    if (play && m_paused) {
         if (m_name == Kdenlive::clipMonitor && m_mltConsumer->position() == m_mltProducer->get_out()) m_mltProducer->seek(0);
+       m_paused = false;
         if (m_mltConsumer->is_stopped()) {
             m_mltConsumer->start();
         }
         m_mltProducer->set_speed(1.0);
         m_mltConsumer->set("refresh", 1);
     } else if (!play) {
+       m_paused = true;
         m_mltProducer->set_speed(0.0);
         m_mltConsumer->set("refresh", 0);
+       if (!m_mltConsumer->is_stopped()) m_mltConsumer->stop();
         m_mltProducer->seek(m_mltConsumer->position());
-        if (!m_mltConsumer->is_stopped()) m_mltConsumer->stop();
-        if (m_isZoneMode) resetZoneMode();
-
-        //emitConsumerStopped();
-        /*m_mltConsumer->set("refresh", 0);
-        m_mltConsumer->stop();
-        m_mltConsumer->purge();
-        m_mltProducer->set_speed(0.0);
-        //m_framePosition = m_mltProducer->position();
-        m_mltProducer->seek(m_framePosition);
-        emit rendererPosition(m_framePosition);*/
     }
 }
 
@@ -1580,11 +1576,13 @@ void Render::play(double speed)
     if (!m_mltProducer) return;
     double current_speed = m_mltProducer->get_speed(); 
     if (current_speed == speed) return;
+    if (m_isZoneMode) resetZoneMode();
     // if (speed == 0.0) m_mltProducer->set("out", m_mltProducer->get_length() - 1);
     m_mltProducer->set_speed(speed);
-    if (m_mltConsumer->is_stopped()) {
+    if (m_mltConsumer->is_stopped() && speed != 0) {
        m_mltConsumer->start();
     }
+    m_paused = speed == 0;
     if (current_speed == 0 && speed != 0) m_mltConsumer->set("refresh", 1);
 }
 
@@ -1593,6 +1591,7 @@ void Render::play(const GenTime & startTime)
     requestedSeekPosition = SEEK_INACTIVE;
     if (!m_mltProducer || !m_mltConsumer)
         return;
+    m_paused = false;
     m_mltProducer->seek((int)(startTime.frames(m_fps)));
     m_mltProducer->set_speed(1.0);
     m_mltConsumer->set("refresh", 1);
@@ -1617,6 +1616,7 @@ void Render::playZone(const GenTime & startTime, const GenTime & stopTime)
     if (!m_isZoneMode) m_originalOut = m_mltProducer->get_playtime() - 1;
     m_mltProducer->set("out", (int)(stopTime.frames(m_fps)));
     m_mltProducer->seek((int)(startTime.frames(m_fps)));
+    m_paused = false;
     m_mltProducer->set_speed(1.0);
     m_mltConsumer->set("refresh", 1);
     if (m_mltConsumer->is_stopped()) m_mltConsumer->start();
@@ -1625,7 +1625,7 @@ void Render::playZone(const GenTime & startTime, const GenTime & stopTime)
 
 void Render::resetZoneMode()
 {
-    if (!m_mltProducer || (!m_isZoneMode && !m_isLoopMode)) return;
+    if (!m_isZoneMode && !m_isLoopMode) return;
     m_mltProducer->set("out", m_originalOut);
     //m_mltProducer->set("eof", "pause");
     m_isZoneMode = false;
@@ -1634,12 +1634,16 @@ void Render::resetZoneMode()
 
 void Render::seekToFrame(int pos)
 {
+    if (!m_mltProducer)
+        return;
     resetZoneMode();
     seek(pos);
 }
 
 void Render::seekToFrameDiff(int diff)
 {
+    if (!m_mltProducer)
+        return;
     resetZoneMode();
     if (requestedSeekPosition == SEEK_INACTIVE)
        seek(m_mltProducer->position() + diff);
@@ -1648,12 +1652,12 @@ void Render::seekToFrameDiff(int diff)
 
 void Render::refreshIfActive()
 {
-    if (!m_mltConsumer->is_stopped() && m_mltProducer && m_mltProducer->get_speed() == 0) m_refreshTimer.start();
+    if (!m_mltConsumer->is_stopped() && m_mltProducer && m_paused) m_refreshTimer.start();
 }
 
 void Render::doRefresh()
 {
-    if (m_mltProducer && m_mltProducer->get_speed() == 0) m_refreshTimer.start();
+    if (m_mltProducer && m_paused) m_refreshTimer.start();
 }
 
 void Render::refresh()
@@ -1663,6 +1667,7 @@ void Render::refresh()
         return;
     if (m_mltConsumer) {
         if (m_mltConsumer->is_stopped()) m_mltConsumer->start();
+       m_paused = false;
         //m_mltConsumer->purge();
         m_mltConsumer->set("refresh", 1);
     }
@@ -1687,6 +1692,12 @@ void Render::setDropFrames(bool show)
     }
 }
 
+bool Render::isPlaying() const
+{
+    if (!m_mltConsumer || m_mltConsumer->is_stopped()) return false;
+    return !m_paused;
+}
+
 double Render::playSpeed() const
 {
     if (m_mltProducer) return m_mltProducer->get_speed();
@@ -1725,7 +1736,7 @@ void Render::emitFrameNumber()
     emit rendererPosition(currentPos);
     if (requestedSeekPosition != SEEK_INACTIVE) {
        m_mltProducer->seek(requestedSeekPosition);
-       if (m_mltProducer->get_speed() == 0) {
+       if (m_paused) {
            refresh();
        }
        requestedSeekPosition = SEEK_INACTIVE;
@@ -1737,6 +1748,7 @@ void Render::emitConsumerStopped()
     // This is used to know when the playing stopped
     if (m_mltProducer) {
         double pos = m_mltProducer->position();
+       m_paused = true;
         if (m_isLoopMode) play(m_loopStart);
         //else if (m_isZoneMode) resetZoneMode();
         emit rendererStopped((int) pos);
@@ -1800,7 +1812,7 @@ void Render::slotCheckSeeking()
 {
       if (requestedSeekPosition != SEEK_INACTIVE) {
        m_mltProducer->seek(requestedSeekPosition);
-       if (m_mltProducer->get_speed() == 0) {
+       if (m_paused) {
            refresh();
        }
     }