Null pointer fixed when running the config wizard. Just quick&dirty, perhaps someone...

[kdenlive] / src / monitormanager.cpp

diff --git a/src/monitormanager.cpp b/src/monitormanager.cpp
index 2dccaa4edbc9b29f39b65fe0368ac5f00ac6289c..09eb326f91d1e8c8b37eb8eddd8406cbb3ce1a97 100644 (file)
--- a/src/monitormanager.cpp
+++ b/src/monitormanager.cpp
@@ -19,6 +19,7 @@
 
 
 #include "monitormanager.h"
+#include "renderer.h"
 #include "kdenlivesettings.h"
 
 #include <mlt++/Mlt.h>
@@ -62,6 +63,7 @@ void MonitorManager::activateMonitor(QString name)
         emit raiseClipMonitor(false);
     }
     m_activeMonitor = name;
+    emit checkColorScopes();
 }
 
 void MonitorManager::slotSwitchMonitors(bool activateClip)
@@ -85,6 +87,11 @@ void MonitorManager::slotPlay()
     else m_projectMonitor->slotPlay();
 }
 
+void MonitorManager::slotPause()
+{
+  stopActiveMonitor();
+}
+
 void MonitorManager::slotPlayZone()
 {
     if (m_clipMonitor->isActive()) m_clipMonitor->slotPlayZone();
@@ -168,5 +175,21 @@ void MonitorManager::slotResetProfiles()
     activateMonitor(active);
 }
 
+void MonitorManager::slotRefreshCurrentMonitor()
+{
+    if (m_clipMonitor->isActive()) m_clipMonitor->refreshMonitor();
+    else m_projectMonitor->refreshMonitor();
+}
+
+void MonitorManager::slotUpdateAudioMonitoring()
+{
+    // if(...) added since they are 0x0 when the config wizard is running! --Granjow
+    if (m_clipMonitor) {
+        m_clipMonitor->render->analyseAudio = KdenliveSettings::monitor_audio();
+    }
+    if (m_projectMonitor) {
+        m_projectMonitor->render->analyseAudio = KdenliveSettings::monitor_audio();
+    }
+}
 
 #include "monitormanager.moc"