X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Frenderer.h;h=45e140a1502a4de396c6482aad5a31f253a54bb8;hb=020035a721ab682e4171443afaf10b5efa189586;hp=f6298504f3a9816a26c5bd297d079e15c8aa77fa;hpb=492d385f45df2bb1c67dcac7d7c541fa1b52a125;p=kdenlive

diff --git a/src/renderer.h b/src/renderer.h
index f6298504..45e140a1 100644
--- 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 {
@@ -106,7 +108,6 @@ Q_OBJECT public:
     void seek(GenTime time);
     void seek(int time);
     void seekToFrameDiff(int diff);
-    int m_isBlocked;
 
     QPixmap getImageThumbnail(KUrl url, int width, int height);
 
@@ -159,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;
@@ -180,8 +181,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. */
@@ -285,6 +289,8 @@ Q_OBJECT public:
     int processingItems() const;
     /** @brief Force processing of clip with selected id. */
     void forceProcessing(const QString &id);
+    /** @brief Are we currently processing clip with selected id. */
+    bool isProcessing(const QString &id);
 
     /** @brief Requests the file properties for the specified URL (will be put in a queue list)
         @param xml The xml parameters for the clip
@@ -308,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;
 
@@ -327,6 +335,7 @@ private:
     QString m_activeProfile;
 
     QTimer *m_osdTimer;
+    QTimer m_refreshTimer;
     QMutex m_mutex;
     QMutex m_infoMutex;
 
@@ -342,6 +351,8 @@ private:
     void mltPasteEffects(Mlt::Producer *source, Mlt::Producer *dest);
     QMap<QString, QString> mltGetTransitionParamsFromXml(QDomElement xml);
     QMap<QString, Mlt::Producer *> m_slowmotionProducers;
+    /** @brief The id of the clip that is currently being loaded for info query */
+    QString m_processingClipId;
 
     /** @brief Build the MLT Consumer object with initial settings.
      *  @param profileName The MLT profile to use for the consumer */
@@ -362,14 +373,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);
@@ -397,9 +407,6 @@ signals:
      */
     void removeInvalidProxy(const QString &id, bool durationError);
     void refreshDocumentProducers(bool displayRatioChanged, bool fpsChanged);
-    
-    /** @brief If we will delete the producer, make sure to pause the monitor */
-    void blockClipMonitor(const QString &);
 
     /** @brief A frame's image has to be shown.
      *