[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdenlive/v0.8.2.1] src: Fix updating of monitor timecode,
From:       Jean-Baptiste Mardelle <jb () kdenlive ! org>
Date:       2011-11-08 11:05:42
Message-ID: 20111108110542.5897EA60BB () git ! kde ! org
[Download RAW message or body]

Git commit cbc47b258bd6782788a8dcff14b9cbdad334ecf8 by Jean-Baptiste Mardelle.
Committed on 08/11/2011 at 12:02.
Pushed by mardelle into branch 'v0.8.2.1'.

Fix updating of monitor timecode, solving offset between timeline and monitor timecode

M  +5    -2    src/monitor.cpp
M  +2    -10   src/monitormanager.cpp

http://commits.kde.org/kdenlive/cbc47b258bd6782788a8dcff14b9cbdad334ecf8

diff --git a/src/monitor.cpp b/src/monitor.cpp
index 50727b9..4e017b5 100644
--- a/src/monitor.cpp
+++ b/src/monitor.cpp
@@ -879,7 +879,10 @@ void Monitor::resetProfile(const QString &profile)
 {
     m_timePos->updateTimeCode(m_monitorManager->timecode());
     if (render == NULL) return;
-    render->resetProfile(profile);
+    if (!render->hasProfile(profile)) {
+        activateMonitor();
+        render->resetProfile(profile);
+    }
     if (m_effectWidget)
         m_effectWidget->resetProfile(render);
 }
@@ -1003,8 +1006,8 @@ void Monitor::slotEffectScene(bool show)
         emit requestFrameForAnalysis(show);
         if (show) {
             m_effectWidget->getScene()->slotZoomFit();
-            render->doRefresh();
         }
+        render->doRefresh();
     }
 }
 
diff --git a/src/monitormanager.cpp b/src/monitormanager.cpp
index 8d0d234..1b0a7c6 100644
--- a/src/monitormanager.cpp
+++ b/src/monitormanager.cpp
@@ -187,16 +187,8 @@ void MonitorManager::slotResetProfiles()
     if (m_projectMonitor == NULL || m_clipMonitor == NULL) return;
     blockSignals(true);
     QString active = m_activeMonitor ? m_activeMonitor->name() : QString();
-    if (!m_clipMonitor->render->hasProfile(KdenliveSettings::current_profile())) {
-        activateMonitor("clip");
-        m_clipMonitor->resetProfile(KdenliveSettings::current_profile());
-        m_clipMonitor->updateTimecodeFormat();
-    }
-    if (!m_projectMonitor->render->hasProfile(KdenliveSettings::current_profile())) {
-        activateMonitor("project");
-        m_projectMonitor->resetProfile(KdenliveSettings::current_profile());
-        m_projectMonitor->updateTimecodeFormat();
-    }
+    m_clipMonitor->resetProfile(KdenliveSettings::current_profile());
+    m_projectMonitor->resetProfile(KdenliveSettings::current_profile());
     if (!active.isEmpty()) activateMonitor(active);
     blockSignals(false);
     if (m_activeMonitor) m_activeMonitor->parentWidget()->raise();

[prev in list] [next in list] [prev in thread] [next in thread]