Commit a41bc84c authored by Jean-Baptiste Mardelle's avatar Jean-Baptiste Mardelle
Browse files

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

parent a4609c2e
......@@ -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);
}
......
......@@ -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();
......
......@@ -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)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment