* Fix crash when using razor tool while playing

[kdenlive] / src / docclipbase.h

diff --git a/src/docclipbase.h b/src/docclipbase.h
index 634a47b40ce02c902f45f4df5b27517ce8eab7a4..37ac0cf65552c0fa64af70f3249dbc82767c2873 100644 (file)
--- a/src/docclipbase.h
+++ b/src/docclipbase.h
@@ -42,7 +42,9 @@ class KdenliveDoc;
 class KThumb;
 class ClipManager;
 
-
+namespace Mlt {
+class Producer;
+};
 
 
 class DocClipBase: public QObject {
@@ -52,9 +54,8 @@ 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, uint id);
-    DocClipBase(const DocClipBase& clip);
-    DocClipBase & operator=(const DocClipBase & clip);
+    DocClipBase(ClipManager *clipManager, QDomElement xml, const QString &id);
+//    DocClipBase & operator=(const DocClipBase & clip);
     virtual ~ DocClipBase();
 
     /** sets the name of this clip. */
@@ -65,14 +66,17 @@ Q_OBJECT public:
 
     /** Returns the description of this clip. */
     const QString description() const;
+    /** Does this clip need a transparent background (e.g. for titles). */
+    bool isTransparent() const;
 
     /** Returns any property of this clip. */
     const QString getProperty(const QString prop) const;
-    void setProperty(QString key, QString value);
+    void setProperty(const QString &key, const QString &value);
+    void clearProperty(const QString &key);
 
     /** Returns the internal unique id of the clip. */
-    uint getId() const;
-    void setId(const uint &newId);
+    const QString &getId() const;
+    void setId(const QString &newId);
 
     //KThumb *thumbCreator;
     bool audioThumbCreated() const;
@@ -105,6 +109,9 @@ Q_OBJECT public:
         return false;
     }
 
+    void setProducer(Mlt::Producer *producer);
+    Mlt::Producer *producer();
+
     /*virtual DocClipAVFile *toDocClipAVFile() {
     return 0;
     }
@@ -190,7 +197,7 @@ private:   // Private attributes
     /** The number of times this clip is used in the project - the number of references to this clip
      * that exist. */
     uint m_refcount;
-
+    Mlt::Producer *m_clipProducer;
     CLIPTYPE m_clipType;
 
     /** A list of snap markers; these markers are added to a clips snap-to points, and are displayed as necessary. */
@@ -205,12 +212,13 @@ private:   // Private attributes
     bool m_audioThumbCreated;
 
     /** a unique numeric id */
-    uint m_id;
+    QString m_id;
     void setAudioThumbCreated(bool isDone);
     /** Holds clip infos like fps, size,... */
     QMap <QString, QString> m_properties;
     /** Create connections for audio thumbnails */
     void slotCreateAudioTimer();
+    void slotRefreshProducer();
 
 public slots:
     void updateAudioThumbnail(QMap<int, QMap<int, QByteArray> > data);