X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fclipitem.h;h=e2e501b6c586dd7dcb8b732e3977fc2584a20ce1;hb=e3674361794bf657e43089b6a07e4e53f714795f;hp=ba04cadc163a4e2324cd5c375088d64bc85e2f51;hpb=f66e14aa6a646790dc613e884a602a1a72acf8a2;p=kdenlive

diff --git a/src/clipitem.h b/src/clipitem.h
index ba04cadc..e2e501b6 100644
--- a/src/clipitem.h
+++ b/src/clipitem.h
@@ -24,49 +24,41 @@
 #include <QGraphicsRectItem>
 #include <QDomElement>
 #include <QGraphicsSceneMouseEvent>
+#include <QTimeLine>
 
 #include "definitions.h"
 #include "gentime.h"
 #include "effectslist.h"
-#include "docclipbase.h"
-#include "kthumb.h"
+#include "abstractclipitem.h"
 
+class DocClipBase;
+class Transition;
 
-class ClipItem : public QObject, public QGraphicsRectItem
-{
-  Q_OBJECT
+class ClipItem : public AbstractClipItem {
+    Q_OBJECT
 
-  public:
-    ClipItem(DocClipBase *clip, int track, int startpos, const QRectF & rect, int duration);
+public:
+    ClipItem(DocClipBase *clip, ItemInfo info, GenTime cropStart, double scale, double fps);
     virtual ~ ClipItem();
     virtual void paint(QPainter *painter,
-                           const QStyleOptionGraphicsItem *option,
-                           QWidget *widget);
-    virtual int type () const;
-    void moveTo(int x, double scale, double offset, int newTrack);
+                       const QStyleOptionGraphicsItem *option,
+                       QWidget *);
+    virtual int type() const;
     void resizeStart(int posx, double scale);
     void resizeEnd(int posx, double scale);
     OPERATIONTYPE operationMode(QPointF pos, double scale);
-    int clipProducer();
-    int clipType();
-    DocClipBase *baseClip();
-    QString clipName();
-    int maxDuration();
-    int track();
-    void setTrack(int track);
-    int startPos();
-    int cropStart();
-    int endPos();
-    int duration();
+    int clipProducer() const;
+    int clipType() const;
+    DocClipBase *baseClip() const;
+    QString clipName() const;
     QDomElement xml() const;
-    int fadeIn() const;
-    int fadeOut() const;
+
     void setFadeOut(int pos, double scale);
     void setFadeIn(int pos, double scale);
     /** Give a string list of the clip's effect names */
     QStringList effectNames();
     /** Add an effect to the clip and return the parameters that will be passed to Mlt */
-    QMap <QString, QString> addEffect(QDomElement effect);
+    QMap <QString, QString> addEffect(QDomElement effect, bool animate = true);
     /** Get the effect parameters that will be passed to Mlt */
     QMap <QString, QString> getEffectArgs(QDomElement effect);
     /** Delete effect with id index */
@@ -79,50 +71,77 @@ class ClipItem : public QObject, public QGraphicsRectItem
     QDomElement effectAt(int ix);
     /** 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();
+    /** update clip properties from base clip */
+    void refreshClip();
+    /** Returns a list of times for this clip's markers */
+    QList <GenTime> snapMarkers() const;
+    uint fadeIn() const;
+    uint fadeOut() const;
+    void setSelectedEffect(int ix);
+    void updateKeyframeEffect();
+    QDomElement selectedEffect();
+    int selectedEffectIndex() const;
 
-  protected:
-    virtual void mouseMoveEvent ( QGraphicsSceneMouseEvent * event );
-    virtual void mouseReleaseEvent ( QGraphicsSceneMouseEvent * event );
-    virtual void mousePressEvent ( QGraphicsSceneMouseEvent * event );
+protected:
+    //virtual void mouseMoveEvent(QGraphicsSceneMouseEvent * event);
+    virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent * event);
+    virtual void mousePressEvent(QGraphicsSceneMouseEvent * event);
+    virtual void dragEnterEvent(QGraphicsSceneDragDropEvent *event);
+    virtual void dragLeaveEvent(QGraphicsSceneDragDropEvent *event);
+    virtual void dropEvent(QGraphicsSceneDragDropEvent *event);
+    virtual void hoverEnterEvent(QGraphicsSceneHoverEvent *);
+    virtual void hoverLeaveEvent(QGraphicsSceneHoverEvent *);
 
-  private:
-    QDomElement m_xml;
+private:
     DocClipBase *m_clip;
-    int m_textWidth;
     OPERATIONTYPE m_resizeMode;
     int m_grabPoint;
     int m_producer;
     CLIPTYPE m_clipType;
     QString m_clipName;
-    int m_maxDuration;
-    int m_cropStart;
-    int m_cropDuration;
+    QString m_effectNames;
+    uint m_startFade;
+    uint m_endFade;
+
     int m_maxTrack;
-    int m_track;
-    int m_startPos;
+
     QPixmap m_startPix;
     QPixmap m_endPix;
     bool m_hasThumbs;
     QTimer *startThumbTimer;
     QTimer *endThumbTimer;
-    uint m_startFade;
-    uint m_endFade;
+
     /** counter used to provide a unique id to each effect */
     int m_effectsCounter;
-    
+    int m_selectedEffect;
+    double m_opacity;
+    QTimeLine *m_timeLine;
+    uint m_thumbsRequested;
+    bool m_hover;
+
     EffectsList m_effectList;
-    QPixmap audioThumbCachePic;
-    bool audioThumbWasDrawn;
+    QList <Transition*> m_transitionsList;
+    QMap<int, QPixmap> audioThumbCachePic;
+    bool audioThumbWasDrawn, audioThumbReady;
     double framePixelWidth;
-  private slots:
+    QMap<int, QPainterPath > channelPaths;
+
+private slots:
     void slotThumbReady(int frame, QPixmap pix);
     void slotFetchThumbs();
     void slotGetStartThumb();
     void slotGetEndThumb();
     void slotGotAudioData();
+    void slotPrepareAudioThumb(double, QPainterPath, int, int);
+    void animate(qreal value);
 
-  signals:
+signals:
     void getThumb(int, int);
+    void prepareAudioThumb(double, QPainterPath, int, int);
 
 };