Merge branch 'refs/heads/v0.8.2'

[kdenlive] / src / monitormanager.h

diff --git a/src/monitormanager.h b/src/monitormanager.h
index 30e1864be2c959c9563c163845495fe495d5c82c..eb58634486ba0fa957173f7242ae62a170dcca49 100644 (file)
--- a/src/monitormanager.h
+++ b/src/monitormanager.h
@@ -46,7 +46,7 @@ public slots:
 
     /** @brief Activates a monitor.
      * @param name name of the monitor to activate */
-    void activateMonitor(QString name = QString());
+    bool activateMonitor(const QString &name = QString());
     bool isActive(const QString &name) const;
     void slotPlay();
     void slotPause();
@@ -76,12 +76,9 @@ private:
     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 */