X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmonitormanager.cpp;h=5c676a66176584ea984b8537ad658aab79529a47;hb=0aa7adc50fc20f5199c7fd6934d4b8b7fbac1213;hp=50be9d6f15b22783b90d1140dc7e21c7b28f1582;hpb=f697b9fd5408e77412f2ee35aa406173630890bf;p=kdenlive

diff --git a/src/monitormanager.cpp b/src/monitormanager.cpp
index 50be9d6f..5c676a66 100644
--- a/src/monitormanager.cpp
+++ b/src/monitormanager.cpp
@@ -1,7 +1,28 @@
+/***************************************************************************
+ *   Copyright (C) 2007 by Jean-Baptiste Mardelle (jb@kdenlive.org)        *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA          *
+ ***************************************************************************/
+
+
 #include <QObject>
 #include <QTimer>
 
 #include "monitormanager.h"
+#include <mlt++/Mlt.h>
 
 MonitorManager::MonitorManager(QWidget *parent)
     : QObject(parent)
@@ -10,24 +31,38 @@ MonitorManager::MonitorManager(QWidget *parent)
 
 }
 
+void MonitorManager::setTimecode(Timecode tc)
+{
+  m_timecode = tc;
+}
+
+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()));
+  //QTimer::singleShot(1750, this, SLOT(initClipMonitor()));
+  initClipMonitor();
+  //initProjectMonitor();
 }
 
 void MonitorManager::initClipMonitor()
 {
   m_clipMonitor->initMonitor();
-  QTimer::singleShot(1500, this, SLOT(initProjectMonitor()));
+  emit connectMonitors();
+  //initProjectMonitor();
+  //QTimer::singleShot(1500, this, SLOT(initProjectMonitor()));
 }
 
 void MonitorManager::initProjectMonitor()
 {
-  m_clipMonitor->stop();
+  //m_clipMonitor->stop();
   m_projectMonitor->initMonitor();
-  activateMonitor("project");
+  // activateMonitor("project");
   emit connectMonitors();
 }