Merge branch 'buildsystem' into next

[kdenlive] / src / renderer.h

diff --git a/src/renderer.h b/src/renderer.h
index ea8b858ff80aa400c46a2aef2763a449b6cfcc8e..45e140a1502a4de396c6482aad5a31f253a54bb8 100644 (file)
--- a/src/renderer.h
+++ b/src/renderer.h
@@ -32,7 +32,8 @@
 #include "gentime.h"
 #include "definitions.h"
 #include "abstractmonitor.h"
-#include "mlt/framework/mlt_types.h"
+
+#include <mlt/framework/mlt_types.h>
 
 #include <kurl.h>
 
@@ -334,6 +335,7 @@ private:
     QString m_activeProfile;
 
     QTimer *m_osdTimer;
+    QTimer m_refreshTimer;
     QMutex m_mutex;
     QMutex m_infoMutex;
 
@@ -371,7 +373,6 @@ private slots:
     /** @brief Refreshes the monitor display. */
     void refresh();
     void slotOsdTimeout();
-    int connectPlaylist();
     /** @brief Process the clip info requests (in a separate thread). */
     void processFileProperties();