Fix monitor timecode display with NTSC profiles:

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

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

diff --git a/src/monitor.cpp b/src/monitor.cpp
index 876eb8f6385e5fa9102e2bd5d7b513337f72d980..25e5808c513bf05482013ba9bd83f11532a91c5a 100644 (file)
--- a/src/monitor.cpp
+++ b/src/monitor.cpp
@@ -764,6 +764,7 @@ void Monitor::slotSaveZone()
 
 void Monitor::resetProfile(const QString profile)
 {
+    m_timePos->updateTimeCode(m_monitorManager->timecode());
     if (render == NULL) return;
     render->resetProfile(profile);
 }

diff --git a/src/timecodedisplay.cpp b/src/timecodedisplay.cpp
index f3e98203449847e27013ea6d718cd527ed1db1fa..69c2690f3eae655c44b2046a16d89c72e25a9305 100644 (file)
--- a/src/timecodedisplay.cpp
+++ b/src/timecodedisplay.cpp
@@ -86,6 +86,12 @@ void TimecodeDisplay::slotUpdateTimeCodeFormat()
     setTimeCodeFormat(KdenliveSettings::frametimecode());
 }
 
+void TimecodeDisplay::updateTimeCode(Timecode t)
+{
+    m_timecode = t;
+    setTimeCodeFormat(KdenliveSettings::frametimecode());
+}
+
 void TimecodeDisplay::keyPressEvent(QKeyEvent *e)
 {
     if (e->key() == Qt::Key_Up)

diff --git a/src/timecodedisplay.h b/src/timecodedisplay.h
index 241b5db9cf53aba390db4c62666d08064e058be9..4a751afb2bf3c04a33279b93ce4b6bb4b7fe27e3 100644 (file)
--- a/src/timecodedisplay.h
+++ b/src/timecodedisplay.h
@@ -64,11 +64,15 @@ public:
 
     /** @brief Returs the widget's timecode object. */
     Timecode timecode() const;
-    
+
     /** @brief Sets value's format to frames or HH:MM:SS:FF according to @param frametimecode.
     * @param frametimecode true = frames, false = HH:MM:SS:FF */
     void setTimeCodeFormat(bool frametimecode);
 
+    /** @brief Sets timecode for current project.
+     * @param t the new timecode */
+    void updateTimeCode(Timecode t);
+
 private:
     /** timecode for widget */
     Timecode m_timecode;