Merge branch 'master' of git://anongit.kde.org/kdenlive

[kdenlive] / src / monitormanager.h

diff --git a/src/monitormanager.h b/src/monitormanager.h
index 171ad0b3aad983f6ede64d7ec5cc785010d5033d..7fbe52002aba3514328fda2575ee242c93f5a489 100644 (file)
--- a/src/monitormanager.h
+++ b/src/monitormanager.h
@@ -46,8 +46,8 @@ public slots:
 
     /** @brief Activates a monitor.
      * @param name name of the monitor to activate */
-    void activateMonitor(QString name = QString());
-    bool isActive(const QString name) const;
+    bool activateMonitor(const QString &name = QString());
+    bool isActive(const QString &name) const;
     void slotPlay();
     void slotPause();
     void slotPlayZone();
@@ -69,19 +69,16 @@ public slots:
     void slotUpdateAudioMonitoring();
 
 private slots:
-    void slotRefreshCurrentMonitor();
+    void slotRefreshCurrentMonitor(const QString &id);
 
 private:
     Monitor *m_clipMonitor;
     Monitor *m_projectMonitor;
     Timecode m_timecode;
     AbstractMonitor *m_activeMonitor;
-    bool m_blocked;
     QList <AbstractMonitor *>m_monitorsList;
 
 signals:
-    /** @brief Emitted when the active monitor changes */
-    void raiseMonitor(AbstractMonitor *);
     /** @brief When the monitor changed, update the visible color scopes */
     void checkColorScopes();
     /** @brief When the active monitor renderer was deleted, reset color scopes */