* Cleanup monitor / MLT communication

[kdenlive] / src / monitormanager.cpp

diff --git a/src/monitormanager.cpp b/src/monitormanager.cpp
index 7e2d184af9eddfd9fccf54e1486b5238affe3996..b8827fac124f51932505a4aaf4d4661ce843f7e3 100644 (file)
--- a/src/monitormanager.cpp
+++ b/src/monitormanager.cpp
@@ -44,13 +44,11 @@ void MonitorManager::initMonitors(Monitor *clipMonitor, Monitor *projectMonitor)
 {
     m_clipMonitor = clipMonitor;
     m_projectMonitor = projectMonitor;
-    connect(m_clipMonitor, SIGNAL(blockMonitors()), this, SLOT(slotBlockMonitors()));
-    connect(m_projectMonitor, SIGNAL(blockMonitors()), this, SLOT(slotBlockMonitors()));
 }
 
 void MonitorManager::activateMonitor(QString name)
 {
-    if (m_blocked) return;
+    if (m_blocked || m_clipMonitor == NULL) return;
     if (m_activeMonitor == name) return;
     if (name == "clip") {
         m_projectMonitor->stop();
@@ -65,9 +63,9 @@ void MonitorManager::activateMonitor(QString name)
     m_activeMonitor = name;
 }
 
-void MonitorManager::switchMonitors()
+void MonitorManager::slotSwitchMonitors()
 {
-    if (m_blocked) return;
+    if (m_blocked || m_clipMonitor == NULL) return;
     if (m_clipMonitor->isActive()) {
         m_clipMonitor->stop();
         m_projectMonitor->start();
@@ -168,23 +166,11 @@ void MonitorManager::slotResetProfiles()
     if (m_blocked) return;
     if (m_projectMonitor == NULL || m_clipMonitor == NULL) return;
     activateMonitor("clip");
-    m_clipMonitor->resetProfile();
+    m_clipMonitor->resetProfile(KdenliveSettings::current_profile());
     activateMonitor("project");
-    m_projectMonitor->resetProfile();
+    m_projectMonitor->resetProfile(KdenliveSettings::current_profile());
     //m_projectMonitor->refreshMonitor(true);
 }
 
-void MonitorManager::slotBlockMonitors()
-{
-    m_blocked = true;
-    if (m_clipMonitor) {
-        m_clipMonitor->blockSignals(true);
-        m_clipMonitor->setEnabled(false);
-    }
-    if (m_projectMonitor) {
-        m_projectMonitor->blockSignals(true);
-        m_projectMonitor->setEnabled(false);
-    }
-}
 
 #include "monitormanager.moc"