X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fclipitem.h;h=f05c866aa047499d84645bcfebd82a9eb056e6e1;hb=d822719940be2025216f9eca473af959fc4c46fc;hp=15d91d8962559babb3c389d289e29c96bc353b88;hpb=8d2ad9ce16b3a9cf469f2063abbd0aaebd5b5285;p=kdenlive

diff --git a/src/clipitem.h b/src/clipitem.h
index 15d91d89..f05c866a 100644
--- a/src/clipitem.h
+++ b/src/clipitem.h
@@ -29,46 +29,37 @@
 #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 QObject, public QGraphicsRectItem {
+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,
-                       QWidget *widget);
+                       QWidget *);
     virtual int type() const;
-    void moveTo(int x, double scale, double offset, int newTrack);
     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();
-    GenTime maxDuration() const;
-    int track() const;
-    void setTrack(int track);
-    GenTime startPos() const;
-    GenTime cropStart() const;
-    GenTime endPos() const;
-    GenTime duration() const;
-    double fps() const;
+    int clipProducer() const;
+    int clipType() const;
+    DocClipBase *baseClip() const;
+    QString clipName() const;
     QDomElement xml() const;
-    int fadeIn() const;
-    int fadeOut() const;
+    ClipItem *clone(double scale) const;
+    const EffectsList effectList();
     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 */
@@ -82,10 +73,27 @@ public:
     /** Replace effect at pos ix with given value */
     void setEffectAt(int ix, QDomElement effect);
     void flashClip();
-    void addTransition(Transition tr);
+    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;
+    QList <CommentedTime> commentedSnapMarkers() const;
+    uint fadeIn() const;
+    uint fadeOut() const;
+    void setSelectedEffect(const int ix);
+    void updateKeyframeEffect();
+    QDomElement selectedEffect();
+    int selectedEffectIndex() const;
+    void initEffect(QDomElement effect);
+    QString keyframes(const int index);
+    void setKeyframes(const int ix, const QString keyframes);
+    void setEffectList(const EffectsList effectList);
 
 protected:
-    virtual void mouseMoveEvent(QGraphicsSceneMouseEvent * event);
+    //virtual void mouseMoveEvent(QGraphicsSceneMouseEvent * event);
     virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent * event);
     virtual void mousePressEvent(QGraphicsSceneMouseEvent * event);
     virtual void dragEnterEvent(QGraphicsSceneDragDropEvent *event);
@@ -95,40 +103,40 @@ protected:
     virtual void hoverLeaveEvent(QGraphicsSceneHoverEvent *);
 
 private:
-    QDomElement m_xml;
     DocClipBase *m_clip;
     OPERATIONTYPE m_resizeMode;
     int m_grabPoint;
     int m_producer;
     CLIPTYPE m_clipType;
     QString m_clipName;
-    GenTime m_maxDuration;
-    GenTime m_cropStart;
-    GenTime m_cropDuration;
+    QString m_effectNames;
+    uint m_startFade;
+    uint m_endFade;
+
     int m_maxTrack;
-    int m_track;
-    GenTime 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;
-    double m_fps;
     bool m_hover;
 
     EffectsList m_effectList;
-    QList <Transition> m_transitionsList;
+    QList <Transition*> m_transitionsList;
     QMap<int, QPixmap> audioThumbCachePic;
     bool audioThumbWasDrawn, audioThumbReady;
     double framePixelWidth;
     QMap<int, QPainterPath > channelPaths;
+    /** Called when clip start is resized, adjust keyframes values */
+    void checkEffectsKeyframesPos(const int previous, const int current, bool fromStart);
 
 private slots:
     void slotThumbReady(int frame, QPixmap pix);
@@ -136,13 +144,12 @@ private slots:
     void slotGetStartThumb();
     void slotGetEndThumb();
     void slotGotAudioData();
-    void slotPrepareAudioThumb(double, QPainterPath, int, int);
+    void slotPrepareAudioThumb(double pixelForOneFrame, QPainterPath path, int startpixel, int endpixel, int channels);
     void animate(qreal value);
 
 signals:
     void getThumb(int, int);
-    void prepareAudioThumb(double, QPainterPath, int, int);
-
+    void prepareAudioThumb(double, QPainterPath, int, int, int);
 };
 
 #endif