Merge branch 'master' into audioAlign

[kdenlive] / src / definitions.h

diff --git a/src/definitions.h b/src/definitions.h
index 33bffbd447ad3aa0a0bb07eb435009da80ecb195..a9c55c85aad0105b6a2e5ce471952c493725497d 100644 (file)
--- a/src/definitions.h
+++ b/src/definitions.h
@@ -26,8 +26,8 @@
 
 #include <QTreeWidgetItem>
 #include <KLocale>
+#include <QDebug>
 
-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, SEEK = 10, SPACER = 11, RUBBERSELECTION = 12};
@@ -58,6 +58,8 @@ enum MessageType {
 
 enum TRACKTYPE { AUDIOTRACK = 0, VIDEOTRACK = 1 };
 
+enum CLIPJOBSTATUS { NOJOB = 0, JOBWAITING = -1, JOBWORKING = -2, JOBDONE = -3, JOBCRASHED = -4, JOBABORTED = -5};
+
 struct TrackInfo {
     TRACKTYPE type;
     QString trackName;
@@ -65,8 +67,12 @@ struct TrackInfo {
     bool isBlind;
     bool isLocked;
     EffectsList effectsList;
+    int duration;
 };
 
+typedef QMap<QString, QString> stringMap;
+typedef QMap <int, QMap <int, QByteArray> > audioByteArray;
+
 struct ItemInfo {
     /** startPos is the position where the clip starts on the track */
     GenTime startPos;
@@ -91,20 +97,37 @@ struct MltVideoProfile {
     int sample_aspect_den;
     int display_aspect_num;
     int display_aspect_den;
+    int colorspace;
+    bool operator==(const MltVideoProfile& point) const
+    {
+        if (!description.isEmpty() && point.description  == description) return true;
+        return      point.frame_rate_num == frame_rate_num &&
+                    point.frame_rate_den  == frame_rate_den  &&
+                    point.width == width &&
+                    point.height == height &&
+                    point.progressive == progressive &&
+                    point.sample_aspect_num == sample_aspect_num &&
+                    point.sample_aspect_den == sample_aspect_den &&
+                    point.display_aspect_den == display_aspect_den &&
+                    point.colorspace == colorspace;
+    }
+    bool operator!=(const MltVideoProfile &other) const {
+        return !(*this == other);
+    }
 };
 
 
 class EffectParameter
 {
 public:
-    EffectParameter(const QString name, const QString value): m_name(name), m_value(value) {}
+    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) {
+    void setValue(const QString &value) {
         m_value = value;
     }
 
@@ -120,12 +143,12 @@ class EffectsParameterList: public QList < EffectParameter >
 {
 public:
     EffectsParameterList(): QList < EffectParameter >() {}
-    bool hasParam(const QString name) const {
+    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 {
+    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();
         }
@@ -135,7 +158,7 @@ public:
         if (name.isEmpty()) return;
         append(EffectParameter(name, value));
     }
-    void removeParam(const QString name) {
+    void removeParam(const QString &name) {
         for (int i = 0; i < size(); i++)
             if (at(i).name() == name) {
                 removeAt(i);
@@ -148,8 +171,8 @@ class CommentedTime
 {
 public:
     CommentedTime(): t(GenTime(0)) {}
-    CommentedTime(const GenTime time, QString comment)
-            : t(time), c(comment) { }
+    CommentedTime(const GenTime &time, QString comment)
+        : t(time), c(comment) { }
 
     QString comment()   const          {
         return (c.isEmpty() ? i18n("Marker") : c);
@@ -193,5 +216,7 @@ private:
 
 };
 
+QDebug operator << (QDebug qd, const ItemInfo &info);
+
 
 #endif