Fix overwrite clip insert

[kdenlive] / src / clipitem.h

diff --git a/src/clipitem.h b/src/clipitem.h
index 8d0feafd1e03e940b1a1927c5a9d5371d738f6ad..0998eccb71b632c0290031f9995ccee00102546f 100644 (file)
--- a/src/clipitem.h
+++ b/src/clipitem.h
@@ -47,23 +47,23 @@ public:
                        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 */
@@ -72,8 +72,10 @@ 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();
@@ -85,13 +87,15 @@ public:
     /** Returns a list of times for this clip's markers */
     QList <GenTime> snapMarkers() const;
     QList <CommentedTime> commentedSnapMarkers() const;
+    /** Get the position of the fade in effect */
     int fadeIn() const;
+    /** Get the position of the fade out effect */
     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);
@@ -99,9 +103,9 @@ public:
     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;
@@ -110,6 +114,8 @@ 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);
@@ -122,6 +128,7 @@ protected:
 
 private:
     DocClipBase *m_clip;
+    ItemInfo m_speedIndependantInfo;
     QString m_producer;
     CLIPTYPE m_clipType;
     QString m_clipName;
@@ -130,6 +137,7 @@ private:
     int m_endFade;
     bool m_audioOnly;
     bool m_videoOnly;
+    QColor m_baseColor;
 
     QPixmap m_startPix;
     QPixmap m_endPix;
@@ -150,8 +158,7 @@ private:
     QMap<int, QPixmap> m_audioThumbCachePic;
     bool m_audioThumbReady;
     double m_framePixelWidth;
-    /** Called when clip start is resized, adjust keyframes values */
-    void checkEffectsKeyframesPos(const int previous, const int current, bool fromStart);
+
     QPixmap m_videoPix;
     QPixmap m_audioPix;
 
@@ -163,7 +170,7 @@ 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();