X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fdocclipbase.h;h=2f52b72547f976d18f385cac2e8471f25000b29a;hb=8e514e8841c1a6dfd0f5ae42188f5612035d0d90;hp=5a33f7b71a308bba5183382d0f6c81dfa6ba8049;hpb=fa3e80a657cee943715b5db1340004e62fd352cc;p=kdenlive

diff --git a/src/docclipbase.h b/src/docclipbase.h
index 5a33f7b7..2f52b725 100644
--- a/src/docclipbase.h
+++ b/src/docclipbase.h
@@ -42,15 +42,17 @@ 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 seperately, it should be possible to combin the two, as is
+     * - e.g. if you can have audio and video separately, it should be possible to combin the two, as is
      *   done here. If a new clip type is added then it should be possible to combine it with both audio
      *   and video. */
 
@@ -58,11 +60,8 @@ Q_OBJECT public:
 //    DocClipBase & operator=(const DocClipBase & clip);
     virtual ~ DocClipBase();
 
-    /** sets the name of this clip. */
-    void setName(const QString name);
-
     /** returns the name of this clip. */
-    const QString & name() const;
+    const QString name() const;
 
     /** Returns the description of this clip. */
     const QString description() const;
@@ -72,6 +71,7 @@ Q_OBJECT public:
     /** Returns any property of this clip. */
     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;
@@ -79,10 +79,11 @@ Q_OBJECT public:
 
     //KThumb *thumbCreator;
     bool audioThumbCreated() const;
+    /*void getClipMainThumb();*/
 
     /** 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);
 
@@ -108,37 +109,20 @@ 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);
-    Mlt::Producer *producer();
-
-    /*virtual DocClipAVFile *toDocClipAVFile() {
-    return 0;
-    }
-
-    virtual DocClipTextFile *toDocClipTextFile() {
-        return 0;
-    }
-
-    virtual bool isDocClipTextFile() const {
-        return false;
-    }
-
-    virtual bool isDocClipVirtual() const {
-        return false;
-    }
-
-    virtual DocClipVirtual *toDocClipVirtual() {
-        return 0;
-    }*/
+    /** 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. */
     bool isProjectClip() const {
         return false;
     }
-    // Appends scene times for this clip to the passed vector.
-    /* virtual void populateSceneTimes(QList < GenTime >
-     &toPopulate) const = 0;*/
 
     /** Reads in the element structure and creates a clip out of it.*/
     // Returns an XML document that describes part of the current scene.
@@ -178,25 +162,34 @@ 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;
 
-    /** Clip is ready to get thumbs */
-    void slotRequestAudioThumbs();
     /** 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 deleteProducers();
+
+    /** Set default play zone for clip monitor */
+    void setZone(QPoint zone);
+    /** Get default play zone for clip monitor */
+    QPoint zone() const;
 
 private:   // Private attributes
-    /** The name of this clip */
-    QString m_name;
+
     /** 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;
-    Mlt::Producer *m_clipProducer;
+    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. */
@@ -215,13 +208,17 @@ private:   // Private attributes
     void setAudioThumbCreated(bool isDone);
     /** Holds clip infos like fps, size,... */
     QMap <QString, QString> m_properties;
+    /** Holds clip metadata like author, copyright,... */
+    QMap <QString, QString> m_metadata;
     /** Create connections for audio thumbnails */
     void slotCreateAudioTimer();
     void slotRefreshProducer();
+    void setProducerProperty(const char *name, int data);
+    void getFileHash(const QString url);
 
 public slots:
     void updateAudioThumbnail(QMap<int, QMap<int, QByteArray> > data);
-    void slotGetAudioThumbs();
+    bool slotGetAudioThumbs();
     QList < CommentedTime > commentedSnapMarkers() const;
     void setSnapMarkers(QList < CommentedTime > markers);
     GenTime findNextSnapMarker(const GenTime & currTime);
@@ -235,7 +232,10 @@ public slots:
     void setClipThumbFrame(const uint &ix);
     uint getClipThumbFrame() const;
     void setProperties(QMap <QString, QString> properties);
+    void setMetadata(QMap <QString, QString> properties);
     QMap <QString, QString> properties() const;
+    QMap <QString, QString> metadata() const;
+
 
 signals:
     void getAudioThumbs();