Integrate with the required MLT hooks for getting Movit to work.

[kdenlive] / src / docclipbase.h

diff --git a/src/docclipbase.h b/src/docclipbase.h
index 46b5c03f74cff218b377de5aa581b1e07b6bb59d..7701f0743d12b1c9251e156968a2818a8c62ff94 100644 (file)
--- a/src/docclipbase.h
+++ b/src/docclipbase.h
@@ -22,7 +22,7 @@
   *@author Jason Wood
   */
 
-#include <qdom.h>
+#include <QtXml/qdom.h>
 #include <QPixmap>
 #include <QObject>
 #include <QTimer>
@@ -92,9 +92,9 @@ public:
     void setDuration(const GenTime &dur);
 
     /** returns clip type (audio, text, image,...) */
-    const CLIPTYPE & clipType() const;
+    const ClipType & clipType() const;
     /** set clip type (audio, text, image,...) */
-    void setClipType(CLIPTYPE type);
+    void setClipType(ClipType type);
 
     /** remove tmp file if the clip has one (for example text clips) */
     void removeTmpFile() const;
@@ -185,7 +185,7 @@ public:
     bool hasCutZone(const QPoint &p) const;
     void removeCutZone(int in, int out);
     QList <CutZoneInfo> cutZones() const;
-    void updateCutZone(int oldin, int oldout, int in, int out, QString desc = QString());
+    void updateCutZone(int oldin, int oldout, int in, int out, const QString &desc = QString());
 
     bool hasVideoCodec(const QString &codec) const;
     bool hasAudioCodec(const QString &codec) const;
@@ -206,7 +206,7 @@ public:
     /** Returns all current properties for this clip */
     QMap <QString, QString> properties() const;
     /** Return the current values for a set of properties */
-    QMap <QString, QString> currentProperties(QMap <QString, QString> props);
+    QMap <QString, QString> currentProperties(const QMap<QString, QString> &props);
     QMap <QString, QStringList> metadata() const;
     /** @brief Returns a short info string about the clip to display in tooltip */
     const QString shortInfo() const;
@@ -219,7 +219,7 @@ private:   // Private attributes
     QList <Mlt::Producer *> m_videoTrackProducers;
     QList <Mlt::Producer *> m_audioTrackProducers;
     QList <Mlt::Producer *> m_toDeleteProducers;
-    CLIPTYPE m_clipType;
+    ClipType m_clipType;
 
     /** A list of snap markers; these markers are added to a clips snap-to points, and are displayed as necessary. */
     QList < CommentedTime > m_snapMarkers;