Use real MLT position in monitors instead of cached one, preventing race condition...

http://www.kdenlive.org/mantis/view.php?id=1036

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

diff --git a/src/monitor.cpp b/src/monitor.cpp
index d54900f34bdb721eb57f548cf80cefe962357c56..b0f7991ec5e23277014aa32f1e5caa0f945a47bc 100644 (file)
--- a/src/monitor.cpp
+++ b/src/monitor.cpp
@@ -51,7 +51,6 @@ Monitor::Monitor(QString name, MonitorManager *manager, QWidget *parent) :
         m_isActive(false),
         m_scale(1),
         m_length(0),
-        m_position(-1),
         m_dragStarted(false)
 {
     m_ui.setupUi(this);
@@ -260,7 +259,7 @@ void Monitor::slotSeekToNextSnap()
 
 GenTime Monitor::position()
 {
-    return GenTime(m_position, m_monitorManager->timecode().fps());
+    return render->seekPosition();
 }
 
 GenTime Monitor::getSnapForPos(bool previous)
@@ -278,7 +277,7 @@ GenTime Monitor::getSnapForPos(bool previous)
     snaps.append(m_currentClip->duration());
     qSort(snaps);
 
-    const GenTime pos(m_position, m_monitorManager->timecode().fps());
+    const GenTime pos = render->seekPosition();
     for (int i = 0; i < snaps.size(); ++i) {
         if (previous && snaps.at(i) >= pos) {
             if (i == 0) i = 1;
@@ -301,7 +300,7 @@ void Monitor::slotZoneMoved(int start, int end)
 
 void Monitor::slotSetZoneStart()
 {
-    m_ruler->setZone(m_position, -1);
+    m_ruler->setZone(render->seekFramePosition(), -1);
     emit zoneUpdated(m_ruler->zone());
     checkOverlay();
     setClipZone(m_ruler->zone());
@@ -309,7 +308,7 @@ void Monitor::slotSetZoneStart()
 
 void Monitor::slotSetZoneEnd()
 {
-    m_ruler->setZone(-1, m_position);
+    m_ruler->setZone(-1, render->seekFramePosition());
     emit zoneUpdated(m_ruler->zone());
     checkOverlay();
     setClipZone(m_ruler->zone());
@@ -412,7 +411,7 @@ void Monitor::wheelEvent(QWheelEvent * event)
     if (event->modifiers() == Qt::ControlModifier) {
         int delta = m_monitorManager->timecode().fps();
         if (event->delta() < 0) delta = 0 - delta;
-        slotSeek(m_position - delta);
+        slotSeek(render->seekFramePosition() - delta);
     } else {
         if (event->delta() <= 0) slotForwardOneFrame();
         else slotRewindOneFrame();
@@ -424,13 +423,13 @@ void Monitor::slotSetThumbFrame()
     if (m_currentClip == NULL) {
         return;
     }
-    m_currentClip->setClipThumbFrame((uint) m_position);
+    m_currentClip->setClipThumbFrame((uint) render->seekFramePosition());
     emit refreshClipThumbnail(m_currentClip->getId());
 }
 
 void Monitor::slotExtractCurrentFrame()
 {
-    QPixmap frame = render->extractFrame(m_position);
+    QPixmap frame = render->extractFrame(render->seekFramePosition());
     QString outputFile = KFileDialog::getSaveFileName(KUrl(), "image/png");
     if (!outputFile.isEmpty()) {
         if (QFile::exists(outputFile) && KMessageBox::questionYesNo(this, i18n("File already exists.\nDo you want to overwrite it?")) == KMessageBox::No) return;
@@ -464,20 +463,20 @@ void Monitor::slotSeek(int pos)
 {
     activateMonitor();
     if (render == NULL) return;
-    m_position = pos;
     render->seekToFrame(pos);
-    emit renderPosition(m_position);
+    emit renderPosition(render->seekFramePosition());
 }
 
 void Monitor::checkOverlay()
 {
     if (m_overlay == NULL) return;
+    int pos = render->seekFramePosition();
     QPoint zone = m_ruler->zone();
-    if (m_position == zone.x()) m_overlay->setOverlayText(i18n("In Point"));
-    else if (m_position == zone.y()) m_overlay->setOverlayText(i18n("Out Point"));
+    if (pos == zone.x()) m_overlay->setOverlayText(i18n("In Point"));
+    else if (pos == zone.y()) m_overlay->setOverlayText(i18n("Out Point"));
     else {
         if (m_currentClip) {
-            QString markerComment = m_currentClip->markerComment(GenTime(m_position, m_monitorManager->timecode().fps()));
+            QString markerComment = m_currentClip->markerComment(GenTime(pos, m_monitorManager->timecode().fps()));
             if (markerComment.isEmpty()) m_overlay->setHidden(true);
             else m_overlay->setOverlayText(markerComment, false);
         } else m_overlay->setHidden(true);
@@ -488,36 +487,32 @@ void Monitor::slotStart()
 {
     activateMonitor();
     render->play(0);
-    m_position = 0;
-    render->seekToFrame(m_position);
-    emit renderPosition(m_position);
+    render->seekToFrame(0);
+    emit renderPosition(0);
 }
 
 void Monitor::slotEnd()
 {
     activateMonitor();
     render->play(0);
-    m_position = render->getLength();
-    render->seekToFrame(m_position);
-    emit renderPosition(m_position);
+    render->seekToFrame(render->getLength());
+    emit renderPosition(render->seekFramePosition());
 }
 
 void Monitor::slotZoneStart()
 {
     activateMonitor();
     render->play(0);
-    m_position = m_ruler->zone().x();
-    render->seekToFrame(m_position);
-    emit renderPosition(m_position);
+    render->seekToFrame(m_ruler->zone().x());
+    emit renderPosition(render->seekFramePosition());
 }
 
 void Monitor::slotZoneEnd()
 {
     activateMonitor();
     render->play(0);
-    m_position = m_ruler->zone().y();
-    render->seekToFrame(m_position);
-    emit renderPosition(m_position);
+    render->seekToFrame(m_ruler->zone().y());
+    emit renderPosition(render->seekFramePosition());
 }
 
 void Monitor::slotRewind(double speed)
@@ -548,33 +543,22 @@ void Monitor::slotRewindOneFrame(int diff)
 {
     activateMonitor();
     render->play(0);
-    if (m_position < 1) return;
-    /*
-     * freebsd needs this hack to upgrade m_position value:
-     * http://www.kdenlive.org/mantis/view.php?id=491
-     */
-    int position = m_position - diff;
-    m_position = qMax(position, 0);
-    render->seekToFrame(m_position);
-    emit renderPosition(m_position);
+    render->seekToFrameDiff(-diff);
+    emit renderPosition(render->seekFramePosition());
 }
 
 void Monitor::slotForwardOneFrame(int diff)
 {
     activateMonitor();
     render->play(0);
-    if (m_position >= m_length) return;
-    m_position += diff;
-    m_position = qMin(m_position, m_length);
-    render->seekToFrame(m_position);
-    emit renderPosition(m_position);
+    render->seekToFrameDiff(diff);
+    emit renderPosition(render->seekFramePosition());
 }
 
 void Monitor::seekCursor(int pos)
 {
     activateMonitor();
     checkOverlay();
-    m_position = pos;
     m_timePos->setText(m_monitorManager->timecode().getTimecodeFromFrames(pos));
     m_ruler->slotNewValue(pos);
 }
@@ -589,7 +573,6 @@ void Monitor::rendererStopped(int pos)
         }
     }
     m_ruler->slotNewValue(pos);
-    m_position = pos;
     checkOverlay();
     m_timePos->setText(m_monitorManager->timecode().getTimecodeFromFrames(pos));
     m_playAction->setChecked(false);
@@ -699,7 +682,6 @@ void Monitor::slotSetXml(DocClipBase *clip, const int position)
             // MLT CONSUMER is broken
             emit blockMonitors();
         }
-        m_position = position;
     } else if (position != -1) render->seek(GenTime(position, render->fps()));
 }
 

diff --git a/src/monitor.h b/src/monitor.h
index 37e3cc65f1cb56f072afcbf4e168ad4ca63d3908..2cffb9498dc72a68f191226852fd693d189da7e4 100644 (file)
--- a/src/monitor.h
+++ b/src/monitor.h
@@ -101,7 +101,6 @@ private:
     bool m_isActive;
     double m_scale;
     int m_length;
-    int m_position;
     bool m_dragStarted;
     MonitorRefresh *m_monitorRefresh;
     KIcon m_playIcon;

diff --git a/src/renderer.cpp b/src/renderer.cpp
index e5d1ad2ba6de328e47c14d0c1d16e052c2723006..c9c9611803ee7fa7b4b6c5c08fe21a20908e5fb5 100644 (file)
--- a/src/renderer.cpp
+++ b/src/renderer.cpp
@@ -240,7 +240,7 @@ void Render::seek(GenTime time)
 {
     if (!m_mltProducer)
         return;
-    m_isBlocked = 0;
+    m_isBlocked = false;
     m_mltProducer->seek((int)(time.frames(m_fps)));
     refresh();
 }
@@ -1236,6 +1236,17 @@ void Render::seekToFrame(int pos)
     refresh();
 }
 
+void Render::seekToFrameDiff(int diff)
+{
+    //kDebug()<<" *********  RENDER SEEK TO POS";
+    if (!m_mltProducer)
+        return;
+    m_isBlocked = false;
+    resetZoneMode();
+    m_mltProducer->seek(m_mltProducer->position() + diff);
+    refresh();
+}
+
 void Render::askForRefresh()
 {
     // Use a Timer so that we don't refresh too much
@@ -1286,6 +1297,11 @@ GenTime Render::seekPosition() const
     else return GenTime();
 }
 
+int Render::seekFramePosition() const
+{
+    if (m_mltProducer) return (int) m_mltProducer->position();
+    return 0;
+}
 
 const QString & Render::rendererName() const
 {
@@ -2101,7 +2117,7 @@ bool Render::mltEditEffect(int track, GenTime position, EffectsParameterList par
         return success;
     }
 
-    // create filter
+    // find filter
     Mlt::Service service(m_mltProducer->parent().get_service());
 
     Mlt::Tractor tractor(service);
@@ -2147,7 +2163,7 @@ bool Render::mltEditEffect(int track, GenTime position, EffectsParameterList par
         m_isBlocked = false;
         return success;
     }
-
+    mlt_service_lock(service.get_service());
     for (int j = 0; j < params.count(); j++) {
         char *name = decodedString(params.at(j).name());
         char *value = decodedString(params.at(j).value());
@@ -2155,6 +2171,7 @@ bool Render::mltEditEffect(int track, GenTime position, EffectsParameterList par
         delete[] name;
         delete[] value;
     }
+    mlt_service_unlock(service.get_service());
 
     m_isBlocked = false;
     refresh();

diff --git a/src/renderer.h b/src/renderer.h
index 7038eec5c26d06d5d95f5beb05a7bdd29f3ed3a2..b0990d8852b9137ebb2a7e566d05ed21d0caef8e 100644 (file)
--- a/src/renderer.h
+++ b/src/renderer.h
@@ -83,6 +83,7 @@ Q_OBJECT public:
     /** Seeks the renderer clip to the given time. */
     void seek(GenTime time);
     void seekToFrame(int pos);
+    void seekToFrameDiff(int diff);
     int m_isBlocked;
 
     //static QPixmap getVideoThumbnail(char *profile, QString file, int frame, int width, int height);
@@ -141,6 +142,7 @@ Q_OBJECT public:
     double playSpeed();
     /** Returns the current seek position of the renderer. */
     GenTime seekPosition() const;
+    int seekFramePosition() const;
 
     void emitFrameNumber(double position);
     void emitConsumerStopped();