Merge branch 'master' into next

[kdenlive] / src / definitions.h

diff --git a/src/definitions.h b/src/definitions.h
index 4384e8c62edecd05a6d8afbcc0cefe567dfd9c59..1a3a255769ca9f47a027050d24c3c213173eb6f7 100644 (file)
--- 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;