* Fix crash when deleting clip and audio thumb was being created

[kdenlive] / src / docclipbase.h

diff --git a/src/docclipbase.h b/src/docclipbase.h
index a19d226215512e79681f8147b9ca411ef8aa5061..8e0f6ac452b792b6108786a0cd7625596126bb74 100644 (file)
--- 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();*/
@@ -119,7 +119,9 @@ 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, 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,28 +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 deleteProducers(bool clearThumbCreator = true);
+    void deleteProducers();
 
     /** Set default play zone for clip monitor */
     void setZone(QPoint zone);
@@ -203,7 +198,12 @@ Q_OBJECT public:
     bool hasAudioCodec(const QString &codec) const;
     bool checkHash() const;
     void setPlaceHolder(bool place);
-    QPixmap extractImage(int frame, int width, int height);
+    QImage extractImage(int frame, int width, int height);
+    void clearThumbProducer();
+    void reloadThumbProducer();
+    void cleanupProducers();
+    bool isClean() const;
+    bool getAudioThumbs();
 
 private:   // Private attributes
 
@@ -212,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;
 
@@ -242,13 +239,16 @@ private:   // Private attributes
     
     /** Try to make sure we don't delete a producer while using it */
     QMutex m_producerMutex;
+    QMutex m_replaceMutex;
+    
+    /** @brief This timer will trigger creation of audio thumbnails. */
+    QTimer m_audioTimer;
 
     /** 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. */
@@ -256,8 +256,7 @@ private:   // Private attributes
 
    
 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);
@@ -271,16 +270,19 @@ public slots:
     uint getClipThumbFrame() const;
     void setProperties(QMap <QString, QString> properties);
     void setMetadata(QMap <QString, QString> properties);
+    /** Returns all current properties for this clip */
     QMap <QString, QString> properties() const;
+    /** Return the current values for a set of properties */
+    QMap <QString, QString> currentProperties(QMap <QString, QString> props);
     QMap <QString, QString> metadata() const;
-    void slotExtractImage(int frame, int frame2);
+    void slotExtractImage(QList <int> frames);
 
 signals:
     void gotAudioData();
     /** @brief Generate a proxy clip (lower resolution copy) named like the clip's hash. */
-    void createProxy(const QString id);
+    void createProxy(const QString &id);
     /** @brief Abort creation of the proxy clip (lower resolution copy). */
-    void abortProxy(const QString id, const QString proxyPath);
+    void abortProxy(const QString &id, const QString &proxyPath);
 };
 
 #endif