X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fdocclipbase.h;h=bae4e62326c2ba9a06ddaa0905cddcd1d0572c79;hb=0e9a1f923a067e05ba721722f9417547f9cd76da;hp=a690377a998e76fd63636f39a6b6b14516fe8f72;hpb=cd85961a9520f2f3c909e889dacd8de539468b89;p=kdenlive

diff --git a/src/docclipbase.h b/src/docclipbase.h
index a690377a..bae4e623 100644
--- a/src/docclipbase.h
+++ b/src/docclipbase.h
@@ -42,12 +42,14 @@ class KdenliveDoc;
 class KThumb;
 class ClipManager;
 
-namespace Mlt {
+namespace Mlt
+{
 class Producer;
 };
 
 
-class DocClipBase: public QObject {
+class DocClipBase: public QObject
+{
 Q_OBJECT public:
     /** this enum determines the types of "feed" available within this clip. types must be non-exclusive
      * - e.g. if you can have audio and video separately, it should be possible to combin the two, as is
@@ -59,7 +61,7 @@ Q_OBJECT public:
     virtual ~ DocClipBase();
 
     /** returns the name of this clip. */
-    const QString & name() const;
+    const QString name() const;
 
     /** Returns the description of this clip. */
     const QString description() const;
@@ -81,7 +83,7 @@ Q_OBJECT public:
 
     /** returns the duration of this clip */
     const GenTime & duration() const;
-    const GenTime &maxDuration() const;
+    const GenTime maxDuration() const;
     /** returns the duration of this clip */
     void setDuration(GenTime dur);
 
@@ -107,8 +109,14 @@ Q_OBJECT public:
         return false;
     }
 
+    /** Sets producers for the current clip (one for each track due to a limitation in MLT's track mixing */
     void setProducer(Mlt::Producer *producer);
+    /** Retrieve a producer for a track */
     Mlt::Producer *producer(int track = -1);
+    /** Retrieve the producer that shows only video */
+    Mlt::Producer *videoProducer();
+    /** Retrieve the producer that shows only audio */
+    Mlt::Producer *audioProducer(int track);
 
     /** Returns true if this clip is a project clip, false otherwise. Overridden in DocClipProject,
      * where it returns true. */
@@ -154,10 +162,9 @@ Q_OBJECT public:
     /** Returns the thumbnail used by this clip */
     const QPixmap & thumbnail() const;
 
-    static DocClipBase *createClip(KdenliveDoc *doc, const QDomElement & element);
     /** 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,14 +180,17 @@ Q_OBJECT public:
     /** Get default play zone for clip monitor */
     QPoint zone() const;
 
+    /** Returns true is clip is missing but user wants to keep it as placeholder */
+    bool isPlaceHolder() 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;
     QList <Mlt::Producer *> m_baseTrackProducers;
+    QList <Mlt::Producer *> m_audioTrackProducers;
+    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. */
@@ -196,6 +206,10 @@ private:   // Private attributes
 
     /** a unique numeric id */
     QString m_id;
+
+    /** Wheter the clip is a placeholder (clip missing but user wants to see it) */
+    bool m_placeHolder;
+
     void setAudioThumbCreated(bool isDone);
     /** Holds clip infos like fps, size,... */
     QMap <QString, QString> m_properties;
@@ -205,7 +219,8 @@ private:   // Private attributes
     void slotCreateAudioTimer();
     void slotRefreshProducer();
     void setProducerProperty(const char *name, int data);
-    void getFileHash(const QString &url);
+    void setProducerProperty(const char *name, double data);
+    void getFileHash(const QString url);
 
 public slots:
     void updateAudioThumbnail(QMap<int, QMap<int, QByteArray> > data);