transitiondialog is now enabled when transition is selected

[kdenlive] / src / monitormanager.cpp

diff --git a/src/monitormanager.cpp b/src/monitormanager.cpp
index 1660fadcffbcf027983deff263be1583aa686495..1765fa86cc4567ef0be401c32891741332050bf4 100644 (file)
--- a/src/monitormanager.cpp
+++ b/src/monitormanager.cpp
@@ -22,63 +22,66 @@
 #include <QTimer>
 
 #include "monitormanager.h"
+#include <mlt++/Mlt.h>
 
 MonitorManager::MonitorManager(QWidget *parent)
-    : QObject(parent)
-{
+        : QObject(parent) {
 
 
 }
 
-void MonitorManager::setTimecode(Timecode tc)
-{
-  m_timecode = tc;
+void MonitorManager::setTimecode(Timecode tc) {
+    m_timecode = tc;
 }
 
-Timecode MonitorManager::timecode()
-{
-  return m_timecode;
+Timecode MonitorManager::timecode() {
+    return m_timecode;
 }
 
-void MonitorManager::initMonitors(Monitor *clipMonitor, Monitor *projectMonitor)
-{
-  m_clipMonitor = clipMonitor;
-  m_projectMonitor = projectMonitor;
-  //QTimer::singleShot(750, this, SLOT(initClipMonitor()));
-  initClipMonitor();
-  //initProjectMonitor();
+void MonitorManager::initMonitors(Monitor *clipMonitor, Monitor *projectMonitor) {
+    m_clipMonitor = clipMonitor;
+    m_projectMonitor = projectMonitor;
 }
 
-void MonitorManager::initClipMonitor()
-{
-  m_clipMonitor->initMonitor();
-  initProjectMonitor();
-  //QTimer::singleShot(1500, this, SLOT(initProjectMonitor()));
+
+void MonitorManager::activateMonitor(QString name) {
+    if (m_activeMonitor == name) return;
+    if (name == "clip") {
+        m_projectMonitor->stop();
+        m_clipMonitor->start();
+        emit raiseClipMonitor(true);
+    } else {
+        m_clipMonitor->stop();
+        m_projectMonitor->start();
+        m_projectMonitor->raise();
+        emit raiseClipMonitor(false);
+    }
+    m_activeMonitor = name;
+}
+
+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::initProjectMonitor()
-{
-  m_clipMonitor->stop();
-  // m_projectMonitor->initMonitor();
-  // activateMonitor("project");
-  emit connectMonitors();
+void MonitorManager::slotPlay() {
+    if (m_activeMonitor == "clip") m_clipMonitor->slotPlay();
+    else m_projectMonitor->slotPlay();
 }
 
-void MonitorManager::activateMonitor(QString name)
-{
-  if (m_activeMonitor == name) return;
-  if (name == "clip") {
-    m_projectMonitor->stop();
-    m_clipMonitor->start();
-    emit raiseClipMonitor(true);
-  }
-  else {
-    m_clipMonitor->stop();
-    m_projectMonitor->start();
-    m_projectMonitor->raise();
-    emit raiseClipMonitor(false);
-  }
-  m_activeMonitor = name;
+void MonitorManager::resetProfiles(QString prof) {
+    m_clipMonitor->resetProfile(prof);
+    m_projectMonitor->resetProfile(prof);
 }
 
 #include "monitormanager.moc"