- Sync AUTHORS and KAboutData.

[kdenlive] / src / monitormanager.cpp

diff --git a/src/monitormanager.cpp b/src/monitormanager.cpp
index b8827fac124f51932505a4aaf4d4661ce843f7e3..b482a92f5e73b0649b7ff455c4d598c3aec84467 100644 (file)
--- a/src/monitormanager.cpp
+++ b/src/monitormanager.cpp
@@ -48,8 +48,10 @@ void MonitorManager::initMonitors(Monitor *clipMonitor, Monitor *projectMonitor)
 
 void MonitorManager::activateMonitor(QString name)
 {
-    if (m_blocked || m_clipMonitor == NULL) return;
-    if (m_activeMonitor == name) return;
+    if (m_blocked || m_clipMonitor == NULL || m_projectMonitor == NULL)
+        return;
+    if (m_activeMonitor == name)
+        return;
     if (name == "clip") {
         m_projectMonitor->stop();
         m_clipMonitor->start();
@@ -57,27 +59,18 @@ void MonitorManager::activateMonitor(QString name)
     } else {
         m_clipMonitor->stop();
         m_projectMonitor->start();
-        m_projectMonitor->raise();
         emit raiseClipMonitor(false);
     }
     m_activeMonitor = name;
+    emit checkColorScopes();
 }
 
-void MonitorManager::slotSwitchMonitors()
+void MonitorManager::slotSwitchMonitors(bool activateClip)
 {
-    if (m_blocked || m_clipMonitor == NULL) return;
-    if (m_clipMonitor->isActive()) {
-        m_clipMonitor->stop();
-        m_projectMonitor->start();
-        m_projectMonitor->raise();
-        m_activeMonitor = m_projectMonitor->name();
-        emit raiseClipMonitor(false);
-    } else {
-        m_projectMonitor->stop();
-        m_clipMonitor->start();
-        m_activeMonitor = m_clipMonitor->name();
-        emit raiseClipMonitor(true);
-    }
+    if (activateClip)
+        activateMonitor("clip");
+    else
+        activateMonitor("project");
 }
 
 void MonitorManager::stopActiveMonitor()
@@ -165,11 +158,15 @@ void MonitorManager::slotResetProfiles()
 {
     if (m_blocked) return;
     if (m_projectMonitor == NULL || m_clipMonitor == NULL) return;
+    QString active = m_activeMonitor;
     activateMonitor("clip");
     m_clipMonitor->resetProfile(KdenliveSettings::current_profile());
+    m_clipMonitor->updateTimecodeFormat();
     activateMonitor("project");
     m_projectMonitor->resetProfile(KdenliveSettings::current_profile());
+    m_projectMonitor->updateTimecodeFormat();
     //m_projectMonitor->refreshMonitor(true);
+    activateMonitor(active);
 }