Merge branch 'buildsystem' into next

[kdenlive] / src / docclipbase.h

diff --git a/src/docclipbase.h b/src/docclipbase.h
index edccd3c4d4220f43d573fa7fccbfcb3df32a502f..31a9a9825525d219007f8ebd0819d769c4e6c340 100644 (file)
--- a/src/docclipbase.h
+++ b/src/docclipbase.h
@@ -82,7 +82,6 @@ Q_OBJECT public:
 
     /** Returns the internal unique id of the clip. */
     const QString &getId() const;
-    void setId(const QString &newId);
 
     //KThumb *thumbCreator;
     bool audioThumbCreated() const;
@@ -120,6 +119,8 @@ Q_OBJECT public:
     void setProducer(Mlt::Producer *producer, bool reset = false, bool readPropertiesFromProducer = false);
     /** Retrieve a producer for a track */
     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 */
@@ -278,7 +279,7 @@ public slots:
     void setMetadata(QMap <QString, QString> properties);
     QMap <QString, QString> properties() const;
     QMap <QString, QString> metadata() const;
-    void slotExtractImage(int frame, int frame2);
+    void slotExtractImage(QList <int> frames);
 
 signals:
     void gotAudioData();