X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmonitormanager.cpp;h=9a94f2379d8a2a3c213c813658bea3a1c4370a55;hb=e19f8a27245266dcc6c76ecdcea6c1c827f04399;hp=28e5825ca1f6df25bb13e2c0a64c9191a921eead;hpb=fa2e7f5b194c12c81167e1a7afefbb1727132017;p=kdenlive

diff --git a/src/monitormanager.cpp b/src/monitormanager.cpp
index 28e5825c..9a94f237 100644
--- a/src/monitormanager.cpp
+++ b/src/monitormanager.cpp
@@ -18,49 +18,33 @@
  ***************************************************************************/
 
 
-#include <QObject>
-#include <QTimer>
-
 #include "monitormanager.h"
+#include "kdenlivesettings.h"
+
 #include <mlt++/Mlt.h>
 
-MonitorManager::MonitorManager(QWidget *parent)
-        : QObject(parent) {
+#include <QObject>
+#include <QTimer>
 
 
+MonitorManager::MonitorManager(QWidget *parent) :
+        QObject(parent)
+{
 }
 
-void MonitorManager::setTimecode(Timecode tc) {
-    m_timecode = tc;
-}
-
-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;
-    //QTimer::singleShot(1750, this, SLOT(initClipMonitor()));
-    initClipMonitor();
-    //initProjectMonitor();
-}
-
-void MonitorManager::initClipMonitor() {
-    m_clipMonitor->initMonitor();
-    emit connectMonitors();
-    //initProjectMonitor();
-    //QTimer::singleShot(1500, this, SLOT(initProjectMonitor()));
-}
-
-void MonitorManager::initProjectMonitor() {
-    //m_clipMonitor->stop();
-    m_projectMonitor->initMonitor();
-    // activateMonitor("project");
-    emit connectMonitors();
 }
 
-void MonitorManager::activateMonitor(QString name) {
+void MonitorManager::activateMonitor(QString name)
+{
     if (m_activeMonitor == name) return;
     if (name == "clip") {
         m_projectMonitor->stop();
@@ -75,14 +59,107 @@ void MonitorManager::activateMonitor(QString name) {
     m_activeMonitor = name;
 }
 
-void MonitorManager::slotPlay() {
-    if (m_activeMonitor == "clip") m_clipMonitor->slotPlay();
+void MonitorManager::switchMonitors()
+{
+    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);
+    }
+}
+
+void MonitorManager::stopActiveMonitor()
+{
+    if (m_clipMonitor->isActive()) m_clipMonitor->pause();
+    else m_projectMonitor->pause();
+}
+
+void MonitorManager::slotPlay()
+{
+    if (m_clipMonitor->isActive()) m_clipMonitor->slotPlay();
     else m_projectMonitor->slotPlay();
 }
 
-void MonitorManager::resetProfiles(QString prof) {
-    m_clipMonitor->resetProfile(prof);
-    m_projectMonitor->resetProfile(prof);
+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_clipMonitor->isActive()) m_clipMonitor->slotForward(speed);
+    else m_projectMonitor->slotForward(speed);
+}
+
+void MonitorManager::slotRewindOneFrame()
+{
+    if (m_clipMonitor->isActive()) m_clipMonitor->slotRewindOneFrame();
+    else m_projectMonitor->slotRewindOneFrame();
+}
+
+void MonitorManager::slotForwardOneFrame()
+{
+    if (m_clipMonitor->isActive()) m_clipMonitor->slotForwardOneFrame();
+    else m_projectMonitor->slotForwardOneFrame();
+}
+
+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_clipMonitor->isActive()) m_clipMonitor->slotEnd();
+    else m_projectMonitor->slotEnd();
+}
+
+void MonitorManager::resetProfiles(Timecode tc)
+{
+    m_timecode = tc;
+    QTimer::singleShot(300, this, SLOT(slotResetProfiles()));
+}
+
+void MonitorManager::slotResetProfiles()
+{
+    activateMonitor("clip");
+    m_clipMonitor->resetProfile();
+    activateMonitor("project");
+    m_projectMonitor->resetProfile();
+    //m_projectMonitor->refreshMonitor(true);
 }
 
 #include "monitormanager.moc"