[PATCH by Ray Lehtiniemi] Do not return references to temporaries.

[kdenlive] / src / docclipbase.h

diff --git a/src/docclipbase.h b/src/docclipbase.h
index cc427b0d96076ae230b92454fce6d55568516b5d..03bc49ed49f19bd13ef60a1421150022e19201f4 100644 (file)
--- a/src/docclipbase.h
+++ b/src/docclipbase.h
@@ -50,7 +50,7 @@ class Producer;
 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 +58,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;
@@ -84,7 +81,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);
 
@@ -113,34 +110,11 @@ Q_OBJECT public:
     void setProducer(Mlt::Producer *producer);
     Mlt::Producer *producer(int track = -1);
 
-    /*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;
-    }*/
-
     /** 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.
@@ -188,10 +162,19 @@ Q_OBJECT public:
     /** 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
@@ -216,11 +199,13 @@ 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, const char *data);
     void setProducerProperty(const char *name, int data);
+    void getFileHash(const QString &url);
 
 public slots:
     void updateAudioThumbnail(QMap<int, QMap<int, QByteArray> > data);
@@ -238,7 +223,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();