X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fdefinitions.h;h=660c3ab7538ce452ec80e67c5820b1a07881d47c;hb=982e28b36ad958735f227c4fb29dcbe447f1abb0;hp=1279a542ec15980026a657b1c693e1ec8046f860;hpb=0db3fd07ec0e359b443292d7964550c986248d81;p=kdenlive

diff --git a/src/definitions.h b/src/definitions.h
index 1279a542..660c3ab7 100644
--- a/src/definitions.h
+++ b/src/definitions.h
@@ -25,14 +25,14 @@
 
 #include "gentime.h"
 
-#define FRAME_SIZE 90
-#define MAXCLIPDURATION 15000
+const int FRAME_SIZE = 90;
+const int MAXCLIPDURATION = 15000;
 
-enum OPERATIONTYPE { NONE = 0, MOVE = 1, RESIZESTART = 2, RESIZEEND = 3, FADEIN = 4, FADEOUT = 5, TRANSITIONSTART = 6, TRANSITIONEND = 7, MOVEGUIDE = 8, KEYFRAME = 9};
+enum OPERATIONTYPE { NONE = 0, MOVE = 1, RESIZESTART = 2, RESIZEEND = 3, FADEIN = 4, FADEOUT = 5, TRANSITIONSTART = 6, TRANSITIONEND = 7, MOVEGUIDE = 8, KEYFRAME = 9, SEEK = 10, SPACER = 11, RUBBERSELECTION = 12};
 enum CLIPTYPE { UNKNOWN = 0, AUDIO = 1, VIDEO = 2, AV = 3, COLOR = 4, IMAGE = 5, TEXT = 6, SLIDESHOW = 7, VIRTUAL = 8, PLAYLIST = 9, FOLDER = 10};
-enum GRAPHICSRECTITEM { AVWIDGET = 70000 , LABELWIDGET , TRANSITIONWIDGET };
+enum GRAPHICSRECTITEM { AVWIDGET = 70000 , LABELWIDGET , TRANSITIONWIDGET  , GROUPWIDGET};
 
-enum PROJECTTOOL { SELECTTOOL = 0 , RAZORTOOL = 1 };
+enum PROJECTTOOL { SELECTTOOL = 0 , RAZORTOOL = 1 , SPACERTOOL = 2 };
 
 enum TRANSITIONTYPE {
     /** TRANSITIONTYPE: between 0-99: video trans, 100-199: video+audio trans, 200-299: audio trans */
@@ -56,11 +56,13 @@ struct TrackInfo {
     TRACKTYPE type;
     bool isMute;
     bool isBlind;
+    bool isLocked;
 };
 
 struct ItemInfo {
     GenTime startPos;
     GenTime endPos;
+    GenTime cropStart;
     int track;
 };
 
@@ -78,7 +80,59 @@ struct MltVideoProfile {
     int display_aspect_den;
 };
 
-class CommentedTime {
+
+class EffectParameter
+{
+public:
+    EffectParameter(const QString name, const QString value): m_name(name), m_value(value) {}
+    QString name()   const          {
+        return m_name;
+    }
+    QString value() const          {
+        return m_value;
+    }
+    void setValue(const QString value) {
+        m_value = value;
+    }
+
+private:
+    QString m_name;
+    QString m_value;
+};
+
+/** Use our own list for effect parameters so that they are not sorted in any ways, because
+    some effects like sox need a precise order
+*/
+class EffectsParameterList: public QList < EffectParameter >
+{
+public:
+    EffectsParameterList(): QList < EffectParameter >() {}
+    bool hasParam(const QString name) const {
+        for (int i = 0; i < size(); i++)
+            if (at(i).name() == name) return true;
+        return false;
+    }
+    QString paramValue(const QString name, QString defaultValue = QString()) const {
+        for (int i = 0; i < size(); i++) {
+            if (at(i).name() == name) return at(i).value();
+        }
+        return defaultValue;
+    }
+    void addParam(const QString &name, const QString &value) {
+        if (name.isEmpty()) return;
+        append(EffectParameter(name, value));
+    }
+    void removeParam(const QString name) {
+        for (int i = 0; i < size(); i++)
+            if (at(i).name() == name) {
+                removeAt(i);
+                break;
+            }
+    }
+};
+
+class CommentedTime
+{
 public:
     CommentedTime(): t(GenTime(0)) {}
     CommentedTime(const GenTime time, QString comment)
@@ -93,8 +147,36 @@ public:
     void    setComment(QString comm) {
         c = comm;
     }
+
+    /* Implementation of > operator; Works identically as with basic types. */
+    bool operator>(CommentedTime op) const {
+        return t > op.time();
+    }
+    /* Implementation of < operator; Works identically as with basic types. */
+    bool operator<(CommentedTime op) const {
+        return t < op.time();
+    }
+    /* Implementation of >= operator; Works identically as with basic types. */
+    bool operator>=(CommentedTime op) const {
+        return t >= op.time();
+    }
+    /* Implementation of <= operator; Works identically as with basic types. */
+    bool operator<=(CommentedTime op) const {
+        return t <= op.time();
+    }
+    /* Implementation of == operator; Works identically as with basic types. */
+    bool operator==(CommentedTime op) const {
+        return t == op.time();
+    }
+    /* Implementation of != operator; Works identically as with basic types. */
+    bool operator!=(CommentedTime op) const {
+        return t != op.time();
+    }
+
 private:
     GenTime t;
     QString c;
+
+
 };
 #endif