X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fdefinitions.h;h=f37a36335e2de6e6f35c919ed3ac65ee24c64589;hb=91792a57eb3511443f5ec585dbfb0af9775e45df;hp=4384e8c62edecd05a6d8afbcc0cefe567dfd9c59;hpb=d9f0349d94f8b232979dc4f5538a1eb04b127065;p=kdenlive

diff --git a/src/definitions.h b/src/definitions.h
index 4384e8c6..f37a3633 100644
--- a/src/definitions.h
+++ b/src/definitions.h
@@ -27,7 +27,6 @@
 #include <QTreeWidgetItem>
 #include <KLocale>
 
-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,7 +57,7 @@ enum MessageType {
 
 enum TRACKTYPE { AUDIOTRACK = 0, VIDEOTRACK = 1 };
 
-enum PROXYSTATUS { NOPROXY = 0, PROXYWAITING = 1, CREATINGPROXY = 2, PROXYDONE = 3, PROXYCRASHED = 4};
+enum PROXYSTATUS { NOPROXY = 0, PROXYWAITING = -1, CREATINGPROXY = -2, PROXYDONE = -3, PROXYCRASHED = -4};
 
 struct TrackInfo {
     TRACKTYPE type;
@@ -70,6 +69,9 @@ struct TrackInfo {
     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;
@@ -95,6 +97,22 @@ struct MltVideoProfile {
     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);
+    }
 };