Fix editing clip crop start and fade effects lost when resizing clip:

[kdenlive] / src / definitions.h

diff --git a/src/definitions.h b/src/definitions.h
index fd2656f9fd25ac43e53f7f446c9c685b4445b83b..5b6c2541f1989707951a69e3307a17cc3e4ab7e1 100644 (file)
--- a/src/definitions.h
+++ b/src/definitions.h
@@ -25,6 +25,7 @@
 #include "effectslist.h"
 
 #include <KLocale>
+#include <QDebug>
 
 #include <QTreeWidgetItem>
  #include <QtCore/QString>
@@ -94,6 +95,19 @@ struct ItemInfo {
     int track;
 };
 
+struct TransitionInfo {
+/** startPos is the position where the clip starts on the track */
+    GenTime startPos;
+    /** endPos is the duration where the clip ends on the track */
+    GenTime endPos;
+    /** the track on which the transition is (b_track)*/
+    int b_track;
+    /** the track on which the transition is applied (a_track)*/
+    int a_track;
+    /** Does the user request for a special a_track */
+    bool forceTrack;
+};
+
 struct MltVideoProfile {
     QString path;
     QString description;
@@ -134,19 +148,25 @@ struct MltVideoProfile {
 class EffectInfo
 {
 public:
-    EffectInfo() {isCollapsed = false; groupIndex = -1;}
+    EffectInfo() {isCollapsed = false; groupIndex = -1; groupIsCollapsed = false;}
     bool isCollapsed;
+    bool groupIsCollapsed;
     int groupIndex;
     QString groupName;
     QString toString() const {
         QStringList data;
-       data << QString::number(isCollapsed) << QString::number(groupIndex) << groupName;
+       // effect collapsed state: 0 = effect not collapsed, 1 = effect collapsed, 
+       // 2 = group collapsed - effect not, 3 = group and effect collapsed
+       int collapsedState = (int) isCollapsed;
+       if (groupIsCollapsed) collapsedState += 2;
+       data << QString::number(collapsedState) << QString::number(groupIndex) << groupName;
        return data.join("/");
     }
     void fromString(QString value) {
        if (value.isEmpty()) return;
        QStringList data = value.split("/");
-       isCollapsed = data.at(0).toInt();
+       isCollapsed = data.at(0).toInt() == 1 || data.at(0).toInt() == 3;
+       groupIsCollapsed = data.at(0).toInt() == 3;
        if (data.count() > 1) groupIndex = data.at(1).toInt();
        if (data.count() > 2) groupName = data.at(2);
     }
@@ -183,6 +203,17 @@ public:
             if (at(i).name() == name) return true;
         return false;
     }
+    void setParamValue(const QString &name, const QString &value) {
+       bool found = false;
+        for (int i = 0; i < size(); i++)
+            if (at(i).name() == name) {
+               // update value
+               replace(i, EffectParameter(name, value));
+               found = true;
+           }
+       if (!found) addParam(name, value);
+    }
+        
     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();
@@ -251,5 +282,7 @@ private:
 
 };
 
+QDebug operator << (QDebug qd, const ItemInfo &info);
+
 
 #endif