Fix clip monitor not activated on open: http://kdenlive.org/mantis/view.php?id=2992

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 475a6095eb2774ec5fe83751cb85dd0bc16c334b..f6fd491a8e2e8e2888e8313324c2257c4ef42cb4 100644 (file)
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -2713,7 +2713,7 @@ void MainWindow::connectDocument(TrackView *trackView, KdenliveDoc *doc)   //cha
 #endif
     //Update the mouse position display so it will display in DF/NDF format by default based on the project setting.
     slotUpdateMousePosition(0);
-    m_monitorManager->activateMonitor(Kdenlive::clipMonitor);
+    m_monitorManager->activateMonitor(Kdenlive::clipMonitor, true);
     // set tool to select tool
     m_buttonSelectTool->setChecked(true);
 }

diff --git a/src/monitor.cpp b/src/monitor.cpp
index 309e79cb20e1fe2b91d470e0f278cf58a99cf837..511f8ea9405490fff3c411552d3cb90bf4791448 100644 (file)
--- a/src/monitor.cpp
+++ b/src/monitor.cpp
@@ -872,7 +872,7 @@ void Monitor::slotLoopClip()
 void Monitor::updateClipProducer(Mlt::Producer *prod)
 {
     if (render == NULL) return;
-   render->setProducer(prod, render->seekFramePosition());
+    render->setProducer(prod, render->seekFramePosition());
 }
 
 void Monitor::slotSetClipProducer(DocClipBase *clip, QPoint zone, bool forceUpdate, int position)
@@ -880,7 +880,6 @@ void Monitor::slotSetClipProducer(DocClipBase *clip, QPoint zone, bool forceUpda
     if (render == NULL) return;
     if (clip == NULL && m_currentClip != NULL) {
        m_currentClip->lastSeekPosition = render->seekFramePosition();
-        kDebug()<<"// SETTING NULL CLIP MONITOR";
         m_currentClip = NULL;
         m_length = -1;
         render->setProducer(NULL, -1);
@@ -897,7 +896,7 @@ void Monitor::slotSetClipProducer(DocClipBase *clip, QPoint zone, bool forceUpda
         if (render->setProducer(prod, position) == -1) {
             // MLT CONSUMER is broken
             kDebug(QtWarningMsg) << "ERROR, Cannot start monitor";
-        }
+        } else start();
     } else {
         if (m_currentClip) {
             slotActivateMonitor();

diff --git a/src/projectlist.cpp b/src/projectlist.cpp
index 6239293cf52e81aeb8fcd7726a4e2b05a25fc334..860b9b4383889b941964b48f3d576cc9265221dd 100644 (file)
--- a/src/projectlist.cpp
+++ b/src/projectlist.cpp
@@ -2380,8 +2380,9 @@ void ProjectList::slotReplyGetFileProperties(const QString &clipId, Mlt::Produce
         return;
     }
     if (replace) toReload = clipId;
-    if (!toReload.isEmpty())
+    if (!toReload.isEmpty()) {
         emit clipNeedsReload(toReload);
+    }
 }
 
 bool ProjectList::adjustProjectProfileToItem(ProjectItem *item)