First big cleanup of transition / clipitem. Transitions are a bit broken for now...

[kdenlive] / src / clipitem.h

diff --git a/src/clipitem.h b/src/clipitem.h
index a576c310cc174bc6f8f99d2a0f02d2a318b96158..f9de3c1a218541cfe2b9be1c0074f2badf29dda4 100644 (file)
--- a/src/clipitem.h
+++ b/src/clipitem.h
@@ -29,16 +29,16 @@
 #include "definitions.h"
 #include "gentime.h"
 #include "effectslist.h"
-#include "docclipbase.h"
-#include "kthumb.h"
-#include "transition.h"
 #include "abstractclipitem.h"
 
+class DocClipBase;
+class Transition;
+
 class ClipItem : public AbstractClipItem {
     Q_OBJECT
 
 public:
-    ClipItem(DocClipBase *clip, int track, GenTime startpos, const QRectF & rect, GenTime duration, double fps);
+    ClipItem(DocClipBase *clip, ItemInfo info, double scale, double fps);
     virtual ~ ClipItem();
     virtual void paint(QPainter *painter,
                        const QStyleOptionGraphicsItem *option,
@@ -72,6 +72,9 @@ public:
     /** Replace effect at pos ix with given value */
     void setEffectAt(int ix, QDomElement effect);
     void flashClip();
+    void addTransition(Transition*);
+    /** regenerate audio and video thumbnails */
+    void resetThumbs();
 
 protected:
     virtual void mouseMoveEvent(QGraphicsSceneMouseEvent * event);
@@ -95,7 +98,6 @@ private:
 
     int m_maxTrack;
 
-
     QPixmap m_startPix;
     QPixmap m_endPix;
     bool m_hasThumbs;
@@ -110,7 +112,7 @@ private:
     bool m_hover;
 
     EffectsList m_effectList;
-    QList <Transition> m_transitionsList;
+    QList <Transition*> m_transitionsList;
     QMap<int, QPixmap> audioThumbCachePic;
     bool audioThumbWasDrawn, audioThumbReady;
     double framePixelWidth;