X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmonitormanager.cpp;h=923f08ccb609dbdf239bd112dbb95500f648f620;hb=bf67d14b18cc897935691c96da63a2e978c5ba3a;hp=cdf800253c8786622a12190393069b894938f403;hpb=3ec710471ae45caa311fae972c02aece12e1c799;p=kdenlive

diff --git a/src/monitormanager.cpp b/src/monitormanager.cpp
index cdf80025..923f08cc 100644
--- a/src/monitormanager.cpp
+++ b/src/monitormanager.cpp
@@ -18,31 +18,35 @@
  ***************************************************************************/
 
 
+#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)
+{
 }
 
-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) {
+void MonitorManager::activateMonitor(QString name)
+{
     if (m_activeMonitor == name) return;
     if (name == "clip") {
         m_projectMonitor->stop();
@@ -57,8 +61,9 @@ void MonitorManager::activateMonitor(QString name) {
     m_activeMonitor = name;
 }
 
-void MonitorManager::switchMonitors() {
-    if (m_activeMonitor == "clip") {
+void MonitorManager::switchMonitors()
+{
+    if (m_clipMonitor->isActive()) {
         m_clipMonitor->stop();
         m_projectMonitor->start();
         m_projectMonitor->raise();
@@ -72,47 +77,87 @@ void MonitorManager::switchMonitors() {
     }
 }
 
-void MonitorManager::slotPlay() {
-    if (m_activeMonitor == "clip") m_clipMonitor->slotPlay();
+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::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(Timecode tc) {
+void MonitorManager::resetProfiles(Timecode tc)
+{
     m_timecode = tc;
-    slotResetProfiles();
+    QTimer::singleShot(300, this, SLOT(slotResetProfiles()));
 }
 
-void MonitorManager::slotResetProfiles() {
+void MonitorManager::slotResetProfiles()
+{
+    if (m_projectMonitor == NULL || m_clipMonitor == NULL) return;
     activateMonitor("clip");
     m_clipMonitor->resetProfile();
     activateMonitor("project");