X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Ftransition.h;h=8960519bfd1d63d558c761f65044ef6eb8d8924f;hb=c5c958f38a4097290f38d155ed4f98fce7517538;hp=30b8137951f3dd2e7ac9e94a3d4229a669c50220;hpb=ff7d517ae54b265c5769a4c411ffa0671f0f9aab;p=kdenlive

diff --git a/src/transition.h b/src/transition.h
index 30b81379..8960519b 100644
--- a/src/transition.h
+++ b/src/transition.h
@@ -23,7 +23,6 @@
 #include <QPixmap>
 #include <QDomElement>
 #include <QMap>
-#include <QLinearGradient>
 
 #include "gentime.h"
 #include "definitions.h"
@@ -36,7 +35,8 @@
 
 class ClipItem;
 
-class Transition : public AbstractClipItem {
+class Transition : public AbstractClipItem
+{
     Q_OBJECT
 public:
 
@@ -61,22 +61,25 @@ public:
     void setTransitionParameters(const QDomElement params);
     void setTransitionDirection(bool inv);
     void setTransitionTrack(int track);
-    QPixmap transitionPixmap() const;
     //Transition *reparent(ClipItem * clip);
     bool isValid() const;
     /** Transition should be linked to another track */
     void updateTransitionEndTrack(int newtrack);
+    void setForcedTrack(bool force, int track);
+    bool forcedTrack() const;
     const ClipItem *referencedClip() const;
     Transition *clone();
     bool isAutomatic() const;
+    void setAutomatic(bool automatic);
+    bool hasGeometry();
+    int defaultZValue() const;
 
 protected:
     virtual QVariant itemChange(GraphicsItemChange change, const QVariant &value);
 
 private:
-    bool m_singleClip;
-    QLinearGradient m_gradient;
     QString m_name;
+    bool m_forceTransitionTrack;
 
     /** true if the transition was added automatically and should be moved with its clip */
     bool m_automaticTransition;
@@ -94,6 +97,10 @@ private:
 
     /** Return the transition type for a given name */
     TRANSITIONTYPE getTransitionForName(const QString & type);
+
+#if QT_VERSION >= 0x040600
+    QPropertyAnimation *m_startAnimation;
+#endif
 };
 
 #endif