From 520bbaa47754e7bab9835f2434d64db904cccbd5 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Mardelle Date: Mon, 19 Nov 2012 20:24:15 +0100 Subject: [PATCH] Fix timeline cursor position when opening a project --- src/mainwindow.cpp | 3 +-- src/trackview.cpp | 6 ++++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 78021b6c..f22a0e44 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -2187,7 +2187,6 @@ void MainWindow::doOpenFile(const KUrl &url, KAutoSaveFile *stale) } m_timelineArea->setTabToolTip(m_timelineArea->currentIndex(), doc->url().path()); trackView->setDuration(trackView->duration()); - trackView->projectView()->initCursorPos(m_projectMonitor->render->seekPosition().frames(doc->fps())); if (m_timelineArea->count() > 1) m_timelineArea->setTabBarHidden(false); slotGotProgressInfo(QString(), -1); @@ -2577,7 +2576,7 @@ void MainWindow::connectDocument(TrackView *trackView, KdenliveDoc *doc) //cha connect(trackView->projectView(), SIGNAL(forceClipProcessing(const QString &)), m_projectList, SLOT(slotForceProcessing(const QString &))); connect(trackView->projectView(), SIGNAL(importKeyframes(GRAPHICSRECTITEM, const QString&, int)), this, SLOT(slotProcessImportKeyframes(GRAPHICSRECTITEM, const QString&, int))); - + connect(m_projectMonitor, SIGNAL(renderPosition(int)), trackView, SLOT(moveCursorPos(int))); connect(m_projectMonitor, SIGNAL(zoneUpdated(QPoint)), trackView, SLOT(slotSetZone(QPoint))); connect(m_projectMonitor, SIGNAL(zoneUpdated(QPoint)), doc, SLOT(setModified())); diff --git a/src/trackview.cpp b/src/trackview.cpp index b9df353d..e46a750b 100644 --- a/src/trackview.cpp +++ b/src/trackview.cpp @@ -415,6 +415,12 @@ void TrackView::parseDocument(QDomDocument doc) } QDomElement infoXml = mlt.firstChildElement("kdenlivedoc"); + QDomElement propsXml = infoXml.firstChildElement("documentproperties"); + + int currentPos = propsXml.attribute("position").toInt(); + if (currentPos > 0) m_trackview->initCursorPos(currentPos); + + // Add guides QDomNodeList guides = infoXml.elementsByTagName("guide"); for (int i = 0; i < guides.count(); i++) { -- 2.39.2