X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmonitormanager.cpp;h=968de22e77b26f6962f0b9c3893d210ee16a7347;hb=d9e091ef9ba5f2afb46f27843fd6d19e03b060cd;hp=8788f385f335f8e3adb595aae1fc92966c712410;hpb=7caecc149e65907e4a57c8115c7cac12042e9308;p=kdenlive

diff --git a/src/monitormanager.cpp b/src/monitormanager.cpp
index 8788f385..968de22e 100644
--- a/src/monitormanager.cpp
+++ b/src/monitormanager.cpp
@@ -18,26 +18,37 @@
  ***************************************************************************/
 
 
+#include "monitormanager.h"
+#include "kdenlivesettings.h"
+
+#include <mlt++/Mlt.h>
+
 #include <QObject>
 #include <QTimer>
 
-#include "monitormanager.h"
-#include <mlt++/Mlt.h>
 
-MonitorManager::MonitorManager(QWidget *parent)
-        : QObject(parent) {
+MonitorManager::MonitorManager(QWidget *parent) :
+        QObject(parent),
+        m_clipMonitor(NULL),
+        m_projectMonitor(NULL),
+        m_blocked(false)
+{
 }
 
-Timecode MonitorManager::timecode() {
+Timecode MonitorManager::timecode()
+{
     return m_timecode;
 }
 
-void MonitorManager::initMonitors(Monitor *clipMonitor, Monitor *projectMonitor) {
+void MonitorManager::initMonitors(Monitor *clipMonitor, Monitor *projectMonitor)
+{
     m_clipMonitor = clipMonitor;
     m_projectMonitor = projectMonitor;
 }
 
-void MonitorManager::activateMonitor(QString name) {
+void MonitorManager::activateMonitor(QString name)
+{
+    if (m_blocked || m_clipMonitor == NULL) return;
     if (m_activeMonitor == name) return;
     if (name == "clip") {
         m_projectMonitor->stop();
@@ -46,20 +57,20 @@ void MonitorManager::activateMonitor(QString name) {
     } else {
         m_clipMonitor->stop();
         m_projectMonitor->start();
-        m_projectMonitor->raise();
         emit raiseClipMonitor(false);
     }
     m_activeMonitor = name;
 }
 
-void MonitorManager::switchMonitors() {
-    if (m_clipMonitor->isActive()) {
+void MonitorManager::slotSwitchMonitors(bool activateClip)
+{
+    if (m_blocked || m_clipMonitor == NULL) return;
+    if (!activateClip && m_clipMonitor->isActive()) {
         m_clipMonitor->stop();
         m_projectMonitor->start();
-        m_projectMonitor->raise();
         m_activeMonitor = m_projectMonitor->name();
         emit raiseClipMonitor(false);
-    } else {
+    } else if (activateClip && m_projectMonitor->isActive()) {
         m_projectMonitor->stop();
         m_clipMonitor->start();
         m_activeMonitor = m_clipMonitor->name();
@@ -67,77 +78,97 @@ void MonitorManager::switchMonitors() {
     }
 }
 
-void MonitorManager::stopActiveMonitor() {
+void MonitorManager::stopActiveMonitor()
+{
+    if (m_blocked) return;
     if (m_clipMonitor->isActive()) m_clipMonitor->pause();
     else m_projectMonitor->pause();
 }
 
-void MonitorManager::slotPlay() {
+void MonitorManager::slotPlay()
+{
     if (m_clipMonitor->isActive()) m_clipMonitor->slotPlay();
     else m_projectMonitor->slotPlay();
 }
 
-void MonitorManager::slotPlayZone() {
+void MonitorManager::slotPlayZone()
+{
     if (m_clipMonitor->isActive()) m_clipMonitor->slotPlayZone();
     else m_projectMonitor->slotPlayZone();
 }
 
-void MonitorManager::slotLoopZone() {
+void MonitorManager::slotLoopZone()
+{
     if (m_clipMonitor->isActive()) m_clipMonitor->slotLoopZone();
     else m_projectMonitor->slotLoopZone();
 }
 
-void MonitorManager::slotRewind(double speed) {
+void MonitorManager::slotRewind(double speed)
+{
     if (m_clipMonitor->isActive()) m_clipMonitor->slotRewind(speed);
     else m_projectMonitor->slotRewind(speed);
 }
 
-void MonitorManager::slotForward(double speed) {
+void MonitorManager::slotForward(double speed)
+{
     if (m_clipMonitor->isActive()) m_clipMonitor->slotForward(speed);
     else m_projectMonitor->slotForward(speed);
 }
 
-void MonitorManager::slotRewindOneFrame() {
+void MonitorManager::slotRewindOneFrame()
+{
     if (m_clipMonitor->isActive()) m_clipMonitor->slotRewindOneFrame();
     else m_projectMonitor->slotRewindOneFrame();
 }
 
-void MonitorManager::slotForwardOneFrame() {
+void MonitorManager::slotForwardOneFrame()
+{
     if (m_clipMonitor->isActive()) m_clipMonitor->slotForwardOneFrame();
     else m_projectMonitor->slotForwardOneFrame();
 }
 
-void MonitorManager::slotRewindOneSecond() {
+void MonitorManager::slotRewindOneSecond()
+{
     if (m_clipMonitor->isActive()) m_clipMonitor->slotRewindOneFrame(m_timecode.fps());
     else m_projectMonitor->slotRewindOneFrame(m_timecode.fps());
 }
 
-void MonitorManager::slotForwardOneSecond() {
+void MonitorManager::slotForwardOneSecond()
+{
     if (m_clipMonitor->isActive()) m_clipMonitor->slotForwardOneFrame(m_timecode.fps());
     else m_projectMonitor->slotForwardOneFrame(m_timecode.fps());
 }
 
-void MonitorManager::slotStart() {
+void MonitorManager::slotStart()
+{
     if (m_clipMonitor->isActive()) m_clipMonitor->slotStart();
     else m_projectMonitor->slotStart();
 }
 
-void MonitorManager::slotEnd() {
+void MonitorManager::slotEnd()
+{
     if (m_clipMonitor->isActive()) m_clipMonitor->slotEnd();
     else m_projectMonitor->slotEnd();
 }
 
-void MonitorManager::resetProfiles(Timecode tc) {
+void MonitorManager::resetProfiles(Timecode tc)
+{
+    if (m_blocked) return;
     m_timecode = tc;
     slotResetProfiles();
+    //QTimer::singleShot(300, this, SLOT(slotResetProfiles()));
 }
 
-void MonitorManager::slotResetProfiles() {
+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);
 }
 
+
 #include "monitormanager.moc"