Fix crash on clip deletion, fix issues with placeholder clips

[kdenlive] / src / docclipbase.h

diff --git a/src/docclipbase.h b/src/docclipbase.h
index ce847f5413ace74b3f4a700f1de7ac98779e9b42..dac2c770846bbeb835882052dad44c3fa6a72f72 100644 (file)
--- a/src/docclipbase.h
+++ b/src/docclipbase.h
@@ -47,6 +47,11 @@ namespace Mlt
 class Producer;
 };
 
+struct CutZoneInfo {
+    QPoint zone;
+    QString description;
+};
+
 
 class DocClipBase: public QObject
 {
@@ -56,7 +61,7 @@ Q_OBJECT public:
      *   done here. If a new clip type is added then it should be possible to combine it with both audio
      *   and video. */
 
-    DocClipBase(ClipManager *clipManager, QDomElement xml, const QString &id, bool placeHolder = false);
+    DocClipBase(ClipManager *clipManager, QDomElement xml, const QString &id);
 //    DocClipBase & operator=(const DocClipBase & clip);
     virtual ~ DocClipBase();
 
@@ -110,7 +115,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);
+    void setProducer(Mlt::Producer *producer, bool reset = false);
     /** Retrieve a producer for a track */
     Mlt::Producer *producer(int track = -1);
     /** Retrieve the producer that shows only video */
@@ -147,7 +152,7 @@ Q_OBJECT public:
     bool hasFileSize() const;
 
     /** Returns the filesize, or 0 if there is no appropriate filesize. */
-    uint fileSize() const;
+    qulonglong fileSize() const;
 
     /** Returns true if this clip refers to the clip passed in. A clip refers to another clip if
      * it uses it as part of it's own composition. */
@@ -164,7 +169,7 @@ Q_OBJECT public:
 
     /** Cache for every audio Frame with 10 Bytes */
     /** format is frame -> channel ->bytes */
-    QMap<int, QMap<int, QByteArray> > audioFrameChache;
+    QMap<int, QMap<int, QByteArray> > m_audioFrameCache;
 
     /** Free cache data */
     void slotClearAudioCache();
@@ -173,6 +178,8 @@ Q_OBJECT public:
     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();
 
     /** Set default play zone for clip monitor */
@@ -182,11 +189,19 @@ Q_OBJECT public:
 
     /** Returns true is clip is missing but user wants to keep it as placeholder */
     bool isPlaceHolder() const;
+    static QString getHash(const QString &path);
+
+    void addCutZone(int in, int out, QString desc = QString());
+    bool hasCutZone(QPoint p) const;
+    void removeCutZone(int in, int out);
+    QList <CutZoneInfo> cutZones() const;
+    void updateCutZone(int oldin, int oldout, int in, int out, QString desc = QString());
+
+    bool hasVideoCodec(const QString &codec) const;
+    bool hasAudioCodec(const QString &codec) const;
 
 private:   // Private attributes
 
-    /** A description of this clip */
-    QString m_description;
     /** The number of times this clip is used in the project - the number of references to this clip
      * that exist. */
     uint m_refcount;
@@ -212,6 +227,8 @@ private:   // Private attributes
     /** Wheter the clip is a placeholder (clip missing but user wants to see it) */
     bool m_placeHolder;
 
+    QList <CutZoneInfo> m_cutZones;
+
     void setAudioThumbCreated(bool isDone);
     /** Holds clip infos like fps, size,... */
     QMap <QString, QString> m_properties;
@@ -221,13 +238,13 @@ private:   // Private attributes
     void slotCreateAudioTimer();
     void slotRefreshProducer();
     void setProducerProperty(const char *name, int data);
+    void setProducerProperty(const char *name, double data);
     void getFileHash(const QString url);
 
 public slots:
     void updateAudioThumbnail(QMap<int, QMap<int, QByteArray> > data);
     bool slotGetAudioThumbs();
     QList < CommentedTime > commentedSnapMarkers() const;
-    void setSnapMarkers(QList < CommentedTime > markers);
     GenTime findNextSnapMarker(const GenTime & currTime);
     GenTime findPreviousSnapMarker(const GenTime & currTime);
     GenTime hasSnapMarkers(const GenTime & time);