Merge branch 'buildsystem'

[kdenlive] / src / renderer.h

diff --git a/src/renderer.h b/src/renderer.h
index 70f91633f8e99a17f8086f4f14deb92ed304802d..34a516ab56af55baf6f413648c65f839ae171e14 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>
 
@@ -59,6 +60,7 @@ class Producer;
 class Filter;
 class Profile;
 class Service;
+class Event;
 };
 
 struct requestClipInfo {
@@ -158,7 +160,7 @@ Q_OBJECT public:
     /** @brief Returns the speed at which the renderer is currently playing.
      *
      * It returns 0.0 when the renderer is not playing anything. */
-    double playSpeed();
+    double playSpeed() const;
 
     /** @brief Returns the current seek position of the renderer. */
     GenTime seekPosition() const;
@@ -284,7 +286,7 @@ Q_OBJECT public:
     /** @brief Returns a pointer to the main producer. */
     Mlt::Producer *getProducer();
     /** @brief Returns the number of clips to process (When requesting clip info). */
-    int processingItems() const;
+    int processingItems();
     /** @brief Force processing of clip with selected id. */
     void forceProcessing(const QString &id);
     /** @brief Are we currently processing clip with selected id. */
@@ -312,6 +314,8 @@ private:
     Mlt::Consumer * m_mltConsumer;
     Mlt::Producer * m_mltProducer;
     Mlt::Profile *m_mltProfile;
+    Mlt::Event *m_showFrameEvent;
+    Mlt::Event *m_pauseEvent;
     double m_fps;
     bool m_externalConsumer;
 
@@ -331,6 +335,7 @@ private:
     QString m_activeProfile;
 
     QTimer *m_osdTimer;
+    QTimer m_refreshTimer;
     QMutex m_mutex;
     QMutex m_infoMutex;
 
@@ -368,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();