From: Jean-Baptiste Mardelle Date: Mon, 26 Jul 2010 15:34:09 +0000 (+0000) Subject: Fix monitor timecode display with NTSC profiles: X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=400dd0e0ea1c71c0d391cf75de69811f06aa6ce3;p=kdenlive 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 876eb8f6..25e5808c 100644 --- 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 f3e98203..69c2690f 100644 --- 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 241b5db9..4a751afb 100644 --- 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;