Finally fixed the proxy crash,

[kdenlive] / src / docclipbase.h

diff --git a/src/docclipbase.h b/src/docclipbase.h
index eea1e33df660492600b580fd2567d69ea7bf6cc4..a19d226215512e79681f8147b9ca411ef8aa5061 100644 (file)
--- a/src/docclipbase.h
+++ b/src/docclipbase.h
@@ -117,7 +117,7 @@ Q_OBJECT public:
     }
 
     /** Sets producers for the current clip (one for each track due to a limitation in MLT's track mixing */
-    void setProducer(Mlt::Producer *producer, bool reset = false);
+    void setProducer(Mlt::Producer *producer, bool reset = false, bool readPropertiesFromProducer = false);
     /** Retrieve a producer for a track */
     Mlt::Producer *producer(int track = -1);
     /** Retrieve the producer that shows only video */
@@ -181,7 +181,6 @@ Q_OBJECT public:
     const char *producerProperty(const char *name) const;
     void setProducerProperty(const char *name, const char *data);
     void resetProducerProperty(const char *name);
-    void clearProducers();
     void deleteProducers(bool clearThumbCreator = true);
 
     /** Set default play zone for clip monitor */
@@ -204,10 +203,7 @@ Q_OBJECT public:
     bool hasAudioCodec(const QString &codec) const;
     bool checkHash() const;
     void setPlaceHolder(bool place);
-    /** @brief Generate a proxy clip (lower resolution copy) named like the clip's hash. */
-    void generateProxy(KUrl proxyFolder);
-    /** @brief Abort creation of the proxy clip (lower resolution copy). */
-    void abortProxy();
+    QPixmap extractImage(int frame, int width, int height);
 
 private:   // Private attributes
 
@@ -243,17 +239,22 @@ private:   // Private attributes
     QMap <QString, QString> m_properties;
     /** Holds clip metadata like author, copyright,... */
     QMap <QString, QString> m_metadata;
+    
+    /** Try to make sure we don't delete a producer while using it */
+    QMutex m_producerMutex;
 
-    QFuture<void> m_proxyThread;
-    /** Used to kill the proxy thread */
-    bool m_abortProxy;
     /** Create connections for audio thumbnails */
     void slotCreateAudioTimer();
     void slotRefreshProducer();
     void setProducerProperty(const char *name, int data);
     void setProducerProperty(const char *name, double data);
     void getFileHash(const QString url);
+    /** @brief When duplicating a producer, make sure all manually set properties are passed to it. */
+    void adjustProducerProperties(Mlt::Producer *prod, const QString &id, bool mute, bool blind);
+    /** @brief Create another instance of a producer. */
+    Mlt::Producer *cloneProducer(Mlt::Producer *source);
 
+   
 public slots:
     void updateAudioThumbnail(QMap<int, QMap<int, QByteArray> > data);
     bool slotGetAudioThumbs();
@@ -272,13 +273,14 @@ public slots:
     void setMetadata(QMap <QString, QString> properties);
     QMap <QString, QString> properties() const;
     QMap <QString, QString> metadata() const;
-
-private slots:
-    void slotGenerateProxy(QStringList parameters);
+    void slotExtractImage(int frame, int frame2);
 
 signals:
     void gotAudioData();
-    void proxyReady(const QString, bool success);
+    /** @brief Generate a proxy clip (lower resolution copy) named like the clip's hash. */
+    void createProxy(const QString id);
+    /** @brief Abort creation of the proxy clip (lower resolution copy). */
+    void abortProxy(const QString id, const QString proxyPath);
 };
 
 #endif