X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fdefinitions.h;h=b525a77fe2cea48d4859c1c7c96717e6118b160a;hb=0a470cfe6d9058c7c3c043485bae8216c66fe9f5;hp=1e03945684739f011886de0150a72d8ebe641833;hpb=01854db1bc9ed67cc69f107dde915fa626091c94;p=kdenlive

diff --git a/src/definitions.h b/src/definitions.h
index 1e039456..b525a77f 100644
--- a/src/definitions.h
+++ b/src/definitions.h
@@ -40,7 +40,7 @@ namespace Kdenlive {
   const QString stopmotionMonitor("stopmotionMonitor");*/
 }
 
-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 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, SCROLLTIMELINE = 13};
 enum CLIPTYPE { UNKNOWN = 0, AUDIO = 1, VIDEO = 2, AV = 3, COLOR = 4, IMAGE = 5, TEXT = 6, SLIDESHOW = 7, VIRTUAL = 8, PLAYLIST = 9 };
 
 enum PROJECTITEMTYPE { PROJECTCLIPTYPE = QTreeWidgetItem::UserType, PROJECTFOLDERTYPE, PROJECTSUBCLIPTYPE };
@@ -70,7 +70,8 @@ enum TRACKTYPE { AUDIOTRACK = 0, VIDEOTRACK = 1 };
 
 enum CLIPJOBSTATUS { NOJOB = 0, JOBWAITING = -1, JOBWORKING = -2, JOBDONE = -3, JOBCRASHED = -4, JOBABORTED = -5};
 
-struct TrackInfo {
+class TrackInfo {
+public:
     TRACKTYPE type;
     QString trackName;
     bool isMute;
@@ -78,12 +79,19 @@ struct TrackInfo {
     bool isLocked;
     EffectsList effectsList;
     int duration;
+    TrackInfo() :
+        type(VIDEOTRACK),
+        isMute(0),
+        isBlind(0),
+        isLocked(0),
+        duration(0) {};
 };
 
 typedef QMap<QString, QString> stringMap;
 typedef QMap <int, QMap <int, QByteArray> > audioByteArray;
 
-struct ItemInfo {
+class ItemInfo {
+public:
     /** startPos is the position where the clip starts on the track */
     GenTime startPos;
     /** endPos is the duration where the clip ends on the track */
@@ -93,9 +101,11 @@ struct ItemInfo {
     /** cropDuration is the duration of the clip */
     GenTime cropDuration;
     int track;
+    ItemInfo() : track(0) {};
 };
 
-struct TransitionInfo {
+class TransitionInfo {
+public:
 /** startPos is the position where the clip starts on the track */
     GenTime startPos;
     /** endPos is the duration where the clip ends on the track */
@@ -106,6 +116,10 @@ struct TransitionInfo {
     int a_track;
     /** Does the user request for a special a_track */
     bool forceTrack;
+    TransitionInfo() :
+        b_track(0),
+        a_track(0),
+        forceTrack(0) {};
 };
 
 class MltVideoProfile {
@@ -248,9 +262,9 @@ public:
 class CommentedTime
 {
 public:
-    CommentedTime(): t(GenTime(0)) {}
-    CommentedTime(const GenTime &time, QString comment)
-        : t(time), c(comment) { }
+    CommentedTime(): t(GenTime(0)), type(0) {}
+    CommentedTime(const GenTime &time, QString comment, int markerType = 0)
+        : t(time), c(comment), type(markerType) { }
 
     QString comment()   const          {
         return (c.isEmpty() ? i18n("Marker") : c);
@@ -261,6 +275,31 @@ public:
     void    setComment(QString comm) {
         c = comm;
     }
+    void setMarkerType(int t) {
+	type = t;
+    }
+    int markerType() const {
+	return type;
+    }
+    static QColor markerColor(int type) {
+	switch (type) {
+	  case 0:
+	      return Qt::red;
+	      break;
+	  case 1:
+	      return Qt::blue;
+	      break;
+	  case 2:
+	      return Qt::green;
+	      break;
+	  case 3:
+	      return Qt::yellow;
+	      break;
+	  default:
+	      return Qt::cyan;
+	      break;
+	}
+    };
 
     /* Implementation of > operator; Works identically as with basic types. */
     bool operator>(CommentedTime op) const {
@@ -290,6 +329,8 @@ public:
 private:
     GenTime t;
     QString c;
+    int type;
+
 
 
 };