Merge branch 'refs/heads/v0.8.2'

[kdenlive] / src / renderer.h

diff --git a/src/renderer.h b/src/renderer.h
index a8de89ea711acb77f1565e0e81867f81de9fea76..4a1c5a56d68b3b80954beffa1bcc0f70388e31f1 100644 (file)
--- a/src/renderer.h
+++ b/src/renderer.h
@@ -59,6 +59,7 @@ class Producer;
 class Filter;
 class Profile;
 class Service;
+class Event;
 };
 
 struct requestClipInfo {
@@ -158,7 +159,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;
@@ -179,8 +180,11 @@ Q_OBJECT public:
     /** @brief Change the Mlt PROFILE
      * @param profileName The MLT profile name
      * @param dropSceneList If true, the current playlist will be deleted
+     * @return true if the profile was changed
      * . */
     int resetProfile(const QString& profileName, bool dropSceneList = false);
+    /** @brief Returns true if the render uses profileName as current profile. */
+    bool hasProfile(const QString& profileName) const;
     double fps() const;
 
     /** @brief Returns the width of a frame for this profile. */
@@ -281,7 +285,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. */
@@ -309,6 +313,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;
 
@@ -328,6 +334,7 @@ private:
     QString m_activeProfile;
 
     QTimer *m_osdTimer;
+    QTimer m_refreshTimer;
     QMutex m_mutex;
     QMutex m_infoMutex;
 
@@ -365,14 +372,13 @@ 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();
 
 signals:
 
     /** @brief The renderer received a reply to a getFileProperties request. */
-    void replyGetFileProperties(const QString &clipId, Mlt::Producer*, const stringMap &, const stringMap &, bool replaceProducer, bool refreshThumbnail = false);
+    void replyGetFileProperties(const QString &clipId, Mlt::Producer*, const stringMap &, const stringMap &, bool replaceProducer);
 
     /** @brief The renderer received a reply to a getImage request. */
     void replyGetImage(const QString &, const QString &, int, int);