X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fdocclipbase.h;h=c2a8bd499e196264cc9e9ff9724429f3d0a9d8e4;hb=b71bbe0b32508be57fd6d2314daf3ab5f36b47e1;hp=a130e16ad4e592c6c708e79cd1c392cfa11a02a6;hpb=0da74b31221622b53639fae1b31ffc5ddd61c009;p=kdenlive

diff --git a/src/docclipbase.h b/src/docclipbase.h
index a130e16a..c2a8bd49 100644
--- a/src/docclipbase.h
+++ b/src/docclipbase.h
@@ -76,14 +76,14 @@ Q_OBJECT public:
     bool isTransparent() const;
 
     /** Returns any property of this clip. */
-    const QString getProperty(const QString prop) const;
+    const QString getProperty(const QString &prop) const;
     void setProperty(const QString &key, const QString &value);
     void clearProperty(const QString &key);
 
     /** Returns the internal unique id of the clip. */
     const QString &getId() const;
-    void setId(const QString &newId);
 
+    bool hasAudioThumb() const;
     //KThumb *thumbCreator;
     bool audioThumbCreated() const;
     /*void getClipMainThumb();*/
@@ -117,9 +117,11 @@ 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);
+    Mlt::Producer *getProducer(int track = -1);
+    /** Get a copy of the producer, for use in the clip monitor */
+    Mlt::Producer *getCloneProducer();
     /** Retrieve the producer that shows only video */
     Mlt::Producer *videoProducer();
     /** Retrieve the producer that shows only audio */
@@ -160,29 +162,21 @@ Q_OBJECT public:
      * it uses it as part of it's own composition. */
     bool referencesClip(DocClipBase * clip) const;
 
-    /** Sets the thumbnail to be used by this clip */
-    void setThumbnail(const QPixmap & pixmap);
-
     /** Returns the thumbnail producer used by this clip */
     KThumb *thumbProducer();
 
-    /** Returns the thumbnail used by this clip */
-    const QPixmap & thumbnail() const;
-
     /** Cache for every audio Frame with 10 Bytes */
     /** format is frame -> channel ->bytes */
     QMap<int, QMap<int, QByteArray> > m_audioFrameCache;
 
     /** Free cache data */
     void slotClearAudioCache();
-    void askForAudioThumbs();
     QString getClipHash() const;
     void refreshThumbUrl();
     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);
+    void deleteProducers();
 
     /** Set default play zone for clip monitor */
     void setZone(QPoint zone);
@@ -204,10 +198,12 @@ 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, QString params);
-    /** @brief Abort creation of the proxy clip (lower resolution copy). */
-    void abortProxy();
+    QImage extractImage(int frame, int width, int height);
+    void clearThumbProducer();
+    void reloadThumbProducer();
+    void cleanupProducers();
+    bool isClean() const;
+    bool getAudioThumbs();
 
 private:   // Private attributes
 
@@ -216,17 +212,14 @@ private:   // Private attributes
     uint m_refcount;
     QList <Mlt::Producer *> m_baseTrackProducers;
     QList <Mlt::Producer *> m_audioTrackProducers;
+    QList <Mlt::Producer *> m_toDeleteProducers;
     Mlt::Producer *m_videoOnlyProducer;
     CLIPTYPE m_clipType;
 
     /** A list of snap markers; these markers are added to a clips snap-to points, and are displayed as necessary. */
     QList < CommentedTime > m_snapMarkers;
-
-    /** A thumbnail for this clip */
-    QPixmap m_thumbnail;
     GenTime m_duration;
 
-    QTimer *m_audioTimer;
     KThumb *m_thumbProd;
     bool m_audioThumbCreated;
 
@@ -243,20 +236,24 @@ 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;
+    QMutex m_replaceMutex;
 
-    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);
+    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();
+    void updateAudioThumbnail(const audioByteArray& data);
     QList < CommentedTime > commentedSnapMarkers() const;
     GenTime findNextSnapMarker(const GenTime & currTime);
     GenTime findPreviousSnapMarker(const GenTime & currTime);
@@ -272,13 +269,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(QList <int> frames);
 
 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