X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fdefinitions.h;h=738e133de56cf35ccb80bd86fb6684c819c0e11a;hb=8fc16957ff5417b21e68ca5d84de89bec38c5a1c;hp=5b6c2541f1989707951a69e3307a17cc3e4ab7e1;hpb=bf1017234649f13060c2eea16488b58c8cdec8a7;p=kdenlive

diff --git a/src/definitions.h b/src/definitions.h
index 5b6c2541..738e133d 100644
--- a/src/definitions.h
+++ b/src/definitions.h
@@ -32,15 +32,17 @@
 
 const int MAXCLIPDURATION = 15000;
 
+
 namespace Kdenlive {
   enum MONITORID { noMonitor, clipMonitor, projectMonitor, recordMonitor, stopmotionMonitor, dvdMonitor };
+  const int DefaultThumbHeight = 100;
   /*const QString clipMonitor("clipMonitor");
   const QString recordMonitor("recordMonitor");
   const QString projectMonitor("projectMonitor");
   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 +72,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 +81,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 +103,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,9 +118,14 @@ 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) {};
 };
 
-struct MltVideoProfile {
+class MltVideoProfile {
+public:
     QString path;
     QString description;
     int frame_rate_num;
@@ -121,6 +138,17 @@ struct MltVideoProfile {
     int display_aspect_num;
     int display_aspect_den;
     int colorspace;
+    MltVideoProfile() :
+        frame_rate_num(0),
+        frame_rate_den(0),
+        width(0),
+        height(0),
+        progressive(0),
+        sample_aspect_num(0),
+        sample_aspect_den(0),
+        display_aspect_num(0),
+        display_aspect_den(0),
+        colorspace(0) {};
     bool operator==(const MltVideoProfile& point) const
     {
         if (!description.isEmpty() && point.description  == description) return true;
@@ -166,7 +194,7 @@ public:
 	if (value.isEmpty()) return;
 	QStringList data = value.split("/");
 	isCollapsed = data.at(0).toInt() == 1 || data.at(0).toInt() == 3;
-	groupIsCollapsed = data.at(0).toInt() == 3;
+	groupIsCollapsed = data.at(0).toInt() >= 2;
 	if (data.count() > 1) groupIndex = data.at(1).toInt();
 	if (data.count() > 2) groupName = data.at(2);
     }
@@ -236,9 +264,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);
@@ -249,6 +277,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 {
@@ -278,6 +331,8 @@ public:
 private:
     GenTime t;
     QString c;
+    int type;
+
 
 
 };