X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmonitormanager.cpp;h=b482a92f5e73b0649b7ff455c4d598c3aec84467;hb=26c1e6482f8f2396575e798daa7495d804080d55;hp=62b1773d0cd1fa0cd9de42bc4371496932d54c94;hpb=ecc434802d1c89637e4547b6994c087b7a3d2b75;p=kdenlive

diff --git a/src/monitormanager.cpp b/src/monitormanager.cpp
index 62b1773d..b482a92f 100644
--- a/src/monitormanager.cpp
+++ b/src/monitormanager.cpp
@@ -18,36 +18,40 @@
  ***************************************************************************/
 
 
-#include <QObject>
-#include <QTimer>
-
 #include "monitormanager.h"
+#include "kdenlivesettings.h"
+
 #include <mlt++/Mlt.h>
 
-MonitorManager::MonitorManager(QWidget *parent)
-        : QObject(parent) {
-}
+#include <QObject>
+#include <QTimer>
 
-void MonitorManager::setTimecode(Timecode tc) {
-    m_timecode = tc;
+
+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;
 }
 
-bool MonitorManager::projectMonitorFocused() {
-    if (m_activeMonitor != "clip") return true;
-    return false;
-}
-
-void MonitorManager::activateMonitor(QString name) {
-    if (m_activeMonitor == name) return;
+void MonitorManager::activateMonitor(QString name)
+{
+    if (m_blocked || m_clipMonitor == NULL || m_projectMonitor == NULL)
+        return;
+    if (m_activeMonitor == name)
+        return;
     if (name == "clip") {
         m_projectMonitor->stop();
         m_clipMonitor->start();
@@ -55,68 +59,115 @@ 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::switchMonitors() {
-    if (m_activeMonitor == "clip") {
-        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);
-    }
+void MonitorManager::slotSwitchMonitors(bool activateClip)
+{
+    if (activateClip)
+        activateMonitor("clip");
+    else
+        activateMonitor("project");
+}
+
+void MonitorManager::stopActiveMonitor()
+{
+    if (m_blocked) return;
+    if (m_clipMonitor->isActive()) m_clipMonitor->pause();
+    else m_projectMonitor->pause();
 }
 
-void MonitorManager::slotPlay() {
-    if (m_activeMonitor == "clip") m_clipMonitor->slotPlay();
+void MonitorManager::slotPlay()
+{
+    if (m_clipMonitor->isActive()) m_clipMonitor->slotPlay();
     else m_projectMonitor->slotPlay();
 }
 
-void MonitorManager::slotRewind(double speed) {
-    if (m_activeMonitor == "clip") m_clipMonitor->slotRewind(speed);
+void MonitorManager::slotPlayZone()
+{
+    if (m_clipMonitor->isActive()) m_clipMonitor->slotPlayZone();
+    else m_projectMonitor->slotPlayZone();
+}
+
+void MonitorManager::slotLoopZone()
+{
+    if (m_clipMonitor->isActive()) m_clipMonitor->slotLoopZone();
+    else m_projectMonitor->slotLoopZone();
+}
+
+void MonitorManager::slotRewind(double speed)
+{
+    if (m_clipMonitor->isActive()) m_clipMonitor->slotRewind(speed);
     else m_projectMonitor->slotRewind(speed);
 }
 
-void MonitorManager::slotForward(double speed) {
-    if (m_activeMonitor == "clip") m_clipMonitor->slotForward(speed);
+void MonitorManager::slotForward(double speed)
+{
+    if (m_clipMonitor->isActive()) m_clipMonitor->slotForward(speed);
     else m_projectMonitor->slotForward(speed);
 }
 
-void MonitorManager::slotRewindOneFrame() {
-    if (m_activeMonitor == "clip") m_clipMonitor->slotRewindOneFrame();
+void MonitorManager::slotRewindOneFrame()
+{
+    if (m_clipMonitor->isActive()) m_clipMonitor->slotRewindOneFrame();
     else m_projectMonitor->slotRewindOneFrame();
 }
 
-void MonitorManager::slotForwardOneFrame() {
-    if (m_activeMonitor == "clip") m_clipMonitor->slotForwardOneFrame();
+void MonitorManager::slotForwardOneFrame()
+{
+    if (m_clipMonitor->isActive()) m_clipMonitor->slotForwardOneFrame();
     else m_projectMonitor->slotForwardOneFrame();
 }
 
-void MonitorManager::slotStart() {
-    if (m_activeMonitor == "clip") m_clipMonitor->slotStart();
+void MonitorManager::slotRewindOneSecond()
+{
+    if (m_clipMonitor->isActive()) m_clipMonitor->slotRewindOneFrame(m_timecode.fps());
+    else m_projectMonitor->slotRewindOneFrame(m_timecode.fps());
+}
+
+void MonitorManager::slotForwardOneSecond()
+{
+    if (m_clipMonitor->isActive()) m_clipMonitor->slotForwardOneFrame(m_timecode.fps());
+    else m_projectMonitor->slotForwardOneFrame(m_timecode.fps());
+}
+
+void MonitorManager::slotStart()
+{
+    if (m_clipMonitor->isActive()) m_clipMonitor->slotStart();
     else m_projectMonitor->slotStart();
 }
 
-void MonitorManager::slotEnd() {
-    if (m_activeMonitor == "clip") m_clipMonitor->slotEnd();
+void MonitorManager::slotEnd()
+{
+    if (m_clipMonitor->isActive()) m_clipMonitor->slotEnd();
     else m_projectMonitor->slotEnd();
 }
 
-void MonitorManager::resetProfiles() {
+void MonitorManager::resetProfiles(Timecode tc)
+{
+    if (m_blocked) return;
+    m_timecode = tc;
+    slotResetProfiles();
+    //QTimer::singleShot(300, this, SLOT(slotResetProfiles()));
+}
+
+void MonitorManager::slotResetProfiles()
+{
+    if (m_blocked) return;
+    if (m_projectMonitor == NULL || m_clipMonitor == NULL) return;
+    QString active = m_activeMonitor;
     activateMonitor("clip");
-    m_clipMonitor->resetProfile();
+    m_clipMonitor->resetProfile(KdenliveSettings::current_profile());
+    m_clipMonitor->updateTimecodeFormat();
     activateMonitor("project");
-    m_projectMonitor->resetProfile();
+    m_projectMonitor->resetProfile(KdenliveSettings::current_profile());
+    m_projectMonitor->updateTimecodeFormat();
     //m_projectMonitor->refreshMonitor(true);
+    activateMonitor(active);
 }
 
+
 #include "monitormanager.moc"