Add *.ts extension to mpeg instead of adding *.mts twice...

[kdenlive] / src / monitormanager.cpp

diff --git a/src/monitormanager.cpp b/src/monitormanager.cpp
index 28e5825ca1f6df25bb13e2c0a64c9191a921eead..36459bd0e8f5da95ba3efe60f8c20dbccbabce38 100644 (file)
--- a/src/monitormanager.cpp
+++ b/src/monitormanager.cpp
@@ -26,12 +26,6 @@
 
 MonitorManager::MonitorManager(QWidget *parent)
         : QObject(parent) {
-
-
-}
-
-void MonitorManager::setTimecode(Timecode tc) {
-    m_timecode = tc;
 }
 
 Timecode MonitorManager::timecode() {
@@ -41,23 +35,6 @@ Timecode MonitorManager::timecode() {
 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) {
@@ -75,14 +52,72 @@ void MonitorManager::activateMonitor(QString name) {
     m_activeMonitor = name;
 }
 
+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_activeMonitor == "clip") m_clipMonitor->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::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::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;
+    slotResetProfiles();
+}
+
+void MonitorManager::slotResetProfiles() {
+    activateMonitor("clip");
+    m_clipMonitor->resetProfile();
+    activateMonitor("project");
+    m_projectMonitor->resetProfile();
+    //m_projectMonitor->refreshMonitor(true);
 }
 
 #include "monitormanager.moc"