Use real MLT position in monitors instead of cached one, preventing race condition...

[kdenlive] / src / renderer.h

diff --git a/src/renderer.h b/src/renderer.h
index affb77d440f82277878b197f6143a31eb5ed3d66..b0990d8852b9137ebb2a7e566d05ed21d0caef8e 100644 (file)
--- a/src/renderer.h
+++ b/src/renderer.h
@@ -18,15 +18,17 @@
 #ifndef RENDERER_H
 #define RENDERER_H
 
+#include "gentime.h"
+#include "definitions.h"
+
+#include <kurl.h>
+
 #include <qdom.h>
 #include <qstring.h>
 #include <qmap.h>
 #include <QList>
+#include <QEvent>
 
-#include <kurl.h>
-
-#include "gentime.h"
-#include "definitions.h"
 
 /**Render encapsulates the client side of the interface to a renderer.
 From Kdenlive's point of view, you treat the Render object as the
@@ -50,10 +52,22 @@ class Frame;
 class Producer;
 class Filter;
 class Profile;
-class Multitrack;
+class Service;
 };
 
 
+class MltErrorEvent : public QEvent
+{
+public:
+    MltErrorEvent(QString message) : QEvent(QEvent::User), m_message(message) {}
+    QString message() const {
+        return m_message;
+    }
+
+private:
+    QString m_message;
+};
+
 
 class Render: public QObject
 {
@@ -69,7 +83,8 @@ Q_OBJECT public:
     /** Seeks the renderer clip to the given time. */
     void seek(GenTime time);
     void seekToFrame(int pos);
-    bool m_isBlocked;
+    void seekToFrameDiff(int diff);
+    int m_isBlocked;
 
     //static QPixmap getVideoThumbnail(char *profile, QString file, int frame, int width, int height);
     QPixmap getImageThumbnail(KUrl url, int width, int height);
@@ -91,9 +106,9 @@ Q_OBJECT public:
 
     /** Wraps the VEML command of the same name. Sets the current scene list to
     be list. */
-    void setSceneList(QDomDocument list, int position = 0);
-    void setSceneList(QString playlist, int position = 0);
-    void setProducer(Mlt::Producer *producer, int position);
+    int setSceneList(QDomDocument list, int position = 0);
+    int setSceneList(QString playlist, int position = 0);
+    int setProducer(Mlt::Producer *producer, int position);
     const QString sceneList();
     bool saveSceneList(QString path, QDomElement kdenliveData = QDomElement());
 
@@ -127,6 +142,7 @@ Q_OBJECT public:
     double playSpeed();
     /** Returns the current seek position of the renderer. */
     GenTime seekPosition() const;
+    int seekFramePosition() const;
 
     void emitFrameNumber(double position);
     void emitConsumerStopped();
@@ -189,14 +205,13 @@ Q_OBJECT public:
 
     QList <Mlt::Producer *> producersList();
     void updatePreviewSettings();
+    void setDropFrames(bool show);
 
 private:   // Private attributes & methods
     /** The name of this renderer - useful to identify the renderes by what they do - e.g. background rendering, workspace monitor, etc... */
     QString m_name;
     Mlt::Consumer * m_mltConsumer;
     Mlt::Producer * m_mltProducer;
-    Mlt::Producer *m_mltTextProducer;
-    Mlt::Filter *m_osdInfo;
     Mlt::Profile *m_mltProfile;
     double m_framePosition;
     double m_fps;
@@ -211,21 +226,18 @@ private:   // Private attributes & methods
     bool m_isSplitView;
 
     Mlt::Producer *m_blackClip;
-    /** Holds the path to on screen display profile */
-    QString m_osdProfile;
     QString m_activeProfile;
 
-    QTimer *refreshTimer;
-    QTimer *osdTimer;
-    KUrl m_exportedFile;
+    QTimer *m_refreshTimer;
+    QTimer *m_osdTimer;
 
     /** A human-readable description of this renderer. */
     int m_winid;
-    int m_externalwinid;
 
     /** Sets the description of this renderer to desc. */
     void closeMlt();
     void mltCheckLength();
+    void mltPasteEffects(Mlt::Producer *source, Mlt::Producer *dest);
     QMap<QString, QString> mltGetTransitionParamsFromXml(QDomElement xml);
     QMap<QString, Mlt::Producer *> m_slowmotionProducers;
     void buildConsumer();
@@ -236,7 +248,7 @@ private slots:  // Private slots
     /** refresh monitor display */
     void refresh();
     void slotOsdTimeout();
-    void connectPlaylist();
+    int connectPlaylist();
     //void initSceneList();
 
 signals:   // Signals
@@ -261,8 +273,9 @@ signals:   // Signals
     void durationChanged(int);
     void rendererPosition(int);
     void rendererStopped(int);
-    void removeInvalidClip(const QString &);
+    void removeInvalidClip(const QString &, bool replaceProducer);
     void refreshDocumentProducers();
+    void blockMonitors();
 
 public slots:  // Public slots
     /** Start Consumer */