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

List:       kde-commits
Subject:    [kdenlive] src: Fix seeking with OpenGl monitor
From:       Jean-Baptiste Mardelle <jb () kdenlive ! org>
Date:       2012-12-18 0:24:10
Message-ID: 20121218002410.12062A6091 () git ! kde ! org
[Download RAW message or body]

Git commit cd6d679212de9a4b123b4402a7452aabd920ed31 by Jean-Baptiste Mardelle.
Committed on 18/12/2012 at 01:23.
Pushed by mardelle into branch 'master'.

Fix seeking with OpenGl monitor

M  +4    -2    src/renderer.cpp

http://commits.kde.org/kdenlive/cd6d679212de9a4b123b4402a7452aabd920ed31

diff --git a/src/renderer.cpp b/src/renderer.cpp
index a110619..a126f55 100644
--- a/src/renderer.cpp
+++ b/src/renderer.cpp
@@ -99,6 +99,7 @@ static void consumer_gl_frame_show(mlt_consumer, Render * self, \
mlt_frame frame_  self->pause();
 	self->emitConsumerStopped();
     }
+    else if (frame.get_double("_speed") == 0) self->emitConsumerStopped();
     self->showFrame(frame);
 }
 
@@ -263,8 +264,8 @@ void Render::buildConsumer(const QString &profileName)
     } else {
         if (!m_mltConsumer) {
 	    m_mltConsumer = new Mlt::Consumer(*m_mltProfile, "sdl_preview");
-	  m_showFrameEvent = m_mltConsumer->listen("consumer-frame-show", this, \
                (mlt_listener) consumer_frame_show);
-	  m_pauseEvent = m_mltConsumer->listen("consumer-sdl-paused", this, (mlt_listener) \
consumer_paused); +	    m_showFrameEvent = \
m_mltConsumer->listen("consumer-frame-show", this, (mlt_listener) \
consumer_frame_show); +	    m_pauseEvent = \
m_mltConsumer->listen("consumer-sdl-paused", this, (mlt_listener) consumer_paused);  \
}  m_mltConsumer->set("window_id", m_winid);
     }
@@ -1814,6 +1815,7 @@ void Render::slotCheckSeeking()
 	if (m_paused) {
 	    refresh();
 	}
+	requestedSeekPosition = SEEK_INACTIVE;
     }
 }
 


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