X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fclipitem.h;h=7be82c5a7ab9bdd9a368e55a22866e8e8b4ca55c;hb=d4828ad52cd3613bfb386d48b02646335d1a2a0f;hp=f2d10f77f90dd024bdcbb626bb2b4e2f39a7d625;hpb=266af950f3c0fa95a7736374335cc91ec568da95;p=kdenlive

diff --git a/src/clipitem.h b/src/clipitem.h
index f2d10f77..7be82c5a 100644
--- a/src/clipitem.h
+++ b/src/clipitem.h
@@ -36,33 +36,34 @@ class DocClipBase;
 class Transition;
 
 
-class ClipItem : public AbstractClipItem {
+class ClipItem : public AbstractClipItem
+{
     Q_OBJECT
 
 public:
-    ClipItem(DocClipBase *clip, ItemInfo info, double fps, double speed, bool generateThumbs = true);
+    ClipItem(DocClipBase *clip, ItemInfo info, double fps, double speed, int strobe, bool generateThumbs = true);
     virtual ~ ClipItem();
     virtual void paint(QPainter *painter,
                        const QStyleOptionGraphicsItem *option,
                        QWidget *);
     virtual int type() const;
-    void resizeStart(int posx, double speed = 1.0);
-    void resizeEnd(int posx, double speed = 1.0, bool updateKeyFrames = true);
+    void resizeStart(int posx);
+    void resizeEnd(int posx);
     OPERATIONTYPE operationMode(QPointF pos);
-    const QString &clipProducer() const;
+    const QString clipProducer() const;
     int clipType() const;
     DocClipBase *baseClip() const;
     QString clipName() const;
     void setClipName(const QString &name);
     QDomElement xml() const;
     ClipItem *clone(ItemInfo info) const;
-    const EffectsList effectList();
+    const EffectsList effectList() const;
     void setFadeOut(int pos);
     void setFadeIn(int pos);
     /** 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 */
-    EffectsParameterList addEffect(QDomElement effect, bool animate = true);
+    EffectsParameterList addEffect(const QDomElement effect, bool animate = true);
     /** Get the effect parameters that will be passed to Mlt */
     EffectsParameterList getEffectArgs(QDomElement effect);
     /** Delete effect with id index */
@@ -71,35 +72,38 @@ public:
     int effectsCount();
     /** return a unique effect id */
     int effectsCounter();
+    /** return a copy of the xml of effect at index ix in stack */
+    QDomElement effectAt(int ix) const;
     /** return the xml of effect at index ix in stack */
-    QDomElement effectAt(int ix);
+    QDomElement getEffectAt(int ix) const;
     /** 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();
+    void resetThumbs(bool clearExistingThumbs);
     /** update clip properties from base clip */
-    void refreshClip();
+    void refreshClip(bool checkDuration);
     /** Returns a list of times for this clip's markers */
     QList <GenTime> snapMarkers() const;
     QList <CommentedTime> commentedSnapMarkers() const;
-    uint fadeIn() const;
-    uint fadeOut() const;
+    int fadeIn() const;
+    int fadeOut() const;
     void setSelectedEffect(const int ix);
     void updateKeyframeEffect();
     QDomElement selectedEffect();
     int selectedEffectIndex() const;
-    void initEffect(QDomElement effect);
+    void initEffect(QDomElement effect, int diff = 0);
     QString keyframes(const int index);
     void setKeyframes(const int ix, const QString keyframes);
     void setEffectList(const EffectsList effectList);
-    void setSpeed(const double speed);
+    void setSpeed(const double speed, int strobe);
     double speed() const;
+    int strobe() const;
     GenTime maxDuration() const;
-    GenTime cropStart() const;
-    GenTime endPos() const;
-    GenTime cropDuration() const;
+    GenTime speedIndependantCropStart() const;
+    GenTime speedIndependantCropDuration() const;
+    const ItemInfo speedIndependantInfo() const;
     int hasEffect(const QString &tag, const QString &id) const;
     bool checkKeyFrames();
     QPixmap startThumb() const;
@@ -108,59 +112,55 @@ public:
     void setAudioOnly(bool force);
     bool isVideoOnly() const;
     bool isAudioOnly() const;
+    /** Called when clip start is resized, adjust keyframes values */
+    bool checkEffectsKeyframesPos(const int previous, const int current, bool fromStart);
 
 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 *);
+    //virtual void hoverEnterEvent(QGraphicsSceneHoverEvent *);
+    //virtual void hoverLeaveEvent(QGraphicsSceneHoverEvent *);
     virtual QVariant itemChange(GraphicsItemChange change, const QVariant &value);
 
 private:
     DocClipBase *m_clip;
-    OPERATIONTYPE m_resizeMode;
-    int m_grabPoint;
+    ItemInfo m_speedIndependantInfo;
     QString m_producer;
     CLIPTYPE m_clipType;
     QString m_clipName;
     QString m_effectNames;
-    uint m_startFade;
-    uint m_endFade;
-    int m_maxTrack;
+    int m_startFade;
+    int m_endFade;
     bool m_audioOnly;
     bool m_videoOnly;
+    QColor m_baseColor;
 
     QPixmap m_startPix;
     QPixmap m_endPix;
     bool m_hasThumbs;
-    QTimer *startThumbTimer;
-    QTimer *endThumbTimer;
+    QTimer m_startThumbTimer;
+    QTimer m_endThumbTimer;
 
     int m_selectedEffect;
-    double m_opacity;
     QTimeLine *m_timeLine;
     bool m_startThumbRequested;
     bool m_endThumbRequested;
-    bool m_hover;
+    //bool m_hover;
     double m_speed;
+    int m_strobe;
 
     EffectsList m_effectList;
     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);
+    QMap<int, QPixmap> m_audioThumbCachePic;
+    bool m_audioThumbReady;
+    double m_framePixelWidth;
+
     QPixmap m_videoPix;
     QPixmap m_audioPix;
 
 private slots:
-    void slotFetchThumbs();
     void slotGetStartThumb();
     void slotGetEndThumb();
     void slotGotAudioData();
@@ -168,9 +168,10 @@ private slots:
     void animate(qreal value);
     void slotSetStartThumb(QImage img);
     void slotSetEndThumb(QImage img);
-    void slotThumbReady(int frame, QPixmap pix);
+    void slotThumbReady(int frame, QImage img);
 
 public slots:
+    void slotFetchThumbs();
     void slotSetStartThumb(const QPixmap pix);
     void slotSetEndThumb(const QPixmap pix);