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

[kdenlive] / src / abstractmonitor.h

diff --git a/src/abstractmonitor.h b/src/abstractmonitor.h
index b55fbd0f9d178025a5e905e06605295e9c803c4c..6d222b16774e35253abdd5838c415642b1f945cf 100644 (file)
--- a/src/abstractmonitor.h
+++ b/src/abstractmonitor.h
@@ -41,7 +41,13 @@ Q_OBJECT public:
      *  @param name A unique identifier for this renderer
      *  @param winid The parent widget identifier (required for SDL display). Set to 0 for OpenGL rendering
      *  @param profile The MLT profile used for the renderer (default one will be used if empty). */
-    explicit AbstractRender(Kdenlive::MONITORID name, QWidget *parent = 0):QObject(parent), sendFrameForAnalysis(false), analyseAudio(false), m_name(name) {}
+    explicit AbstractRender(Kdenlive::MonitorId name, QWidget *parent = 0)
+        : QObject(parent),
+          sendFrameForAnalysis(false),
+          analyseAudio(false),
+          m_name(name)
+    {
+    }
 
     /** @brief Destroy the MLT Renderer. */
     virtual ~AbstractRender() {}
@@ -62,10 +68,10 @@ private:
     
 signals:
     /** @brief The renderer refreshed the current frame. */
-    void frameUpdated(QImage);
+    void frameUpdated(const QImage &);
 
     /** @brief This signal contains the audio of the current frame. */
-    void audioSamplesSignal(QVector<int16_t>,int,int,int);
+    void audioSamplesSignal(const QVector<int16_t>&,int,int,int);
 };
 
 
@@ -88,8 +94,8 @@ class AbstractMonitor : public QWidget
 {
     Q_OBJECT
 public:
-    AbstractMonitor(Kdenlive::MONITORID id, MonitorManager *manager, QWidget *parent = 0);
-    Kdenlive::MONITORID id() {return m_id;};
+    AbstractMonitor(Kdenlive::MonitorId id, MonitorManager *manager, QWidget *parent = 0);
+    Kdenlive::MonitorId id() {return m_id;}
     virtual ~AbstractMonitor();
     virtual AbstractRender *abstractRender() = 0;
     bool isActive() const;
@@ -107,7 +113,7 @@ public slots:
     virtual void slotSwitchFullScreen() = 0;
 
 protected:
-    Kdenlive::MONITORID m_id;
+    Kdenlive::MonitorId m_id;
     MonitorManager *m_monitorManager;
 };