Fix lots of issues with slowmotioned clips (bugs in move, resize, copy, load & save)

[kdenlive] / src / clipitem.h

diff --git a/src/clipitem.h b/src/clipitem.h
index c1589cd74bcff254270fcba901514518e28681d9..7aa29fec23ada183c49c04061bcc6071d4a3d781 100644 (file)
--- a/src/clipitem.h
+++ b/src/clipitem.h
@@ -40,14 +40,14 @@ class ClipItem : public AbstractClipItem {
     Q_OBJECT
 
 public:
-    ClipItem(DocClipBase *clip, ItemInfo info, double fps);
+    ClipItem(DocClipBase *clip, ItemInfo info, double fps, double speed, bool generateThumbs = true);
     virtual ~ ClipItem();
     virtual void paint(QPainter *painter,
                        const QStyleOptionGraphicsItem *option,
                        QWidget *);
     virtual int type() const;
-    void resizeStart(int posx);
-    void resizeEnd(int posx);
+    void resizeStart(int posx, double speed = 1.0);
+    void resizeEnd(int posx, double speed = 1.0, bool updateKeyFrames = true);
     OPERATIONTYPE operationMode(QPointF pos);
     const QString &clipProducer() const;
     int clipType() const;
@@ -61,9 +61,9 @@ public:
     /** 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 */
-    QHash <QString, QString> addEffect(QDomElement effect, bool animate = true);
+    EffectsParameterList addEffect(QDomElement effect, bool animate = true);
     /** Get the effect parameters that will be passed to Mlt */
-    QHash <QString, QString> getEffectArgs(QDomElement effect);
+    EffectsParameterList getEffectArgs(QDomElement effect);
     /** Delete effect with id index */
     void deleteEffect(QString index);
     /** return the number of effects in that clip */
@@ -96,7 +96,13 @@ public:
     void setSpeed(const double speed);
     double speed() const;
     GenTime maxDuration() const;
+    GenTime cropStart() const;
+    GenTime endPos() const;
+    GenTime cropDuration() const;
     int hasEffect(const QString &tag, const QString &id) const;
+    bool checkKeyFrames();
+    QPixmap startThumb() const;
+    QPixmap endThumb() const;
 
 protected:
     //virtual void mouseMoveEvent(QGraphicsSceneMouseEvent * event);
@@ -127,8 +133,6 @@ private:
     QTimer *startThumbTimer;
     QTimer *endThumbTimer;
 
-    /** counter used to provide a unique id to each effect */
-    int m_effectsCounter;
     int m_selectedEffect;
     double m_opacity;
     QTimeLine *m_timeLine;
@@ -155,10 +159,12 @@ private slots:
     void animate(qreal value);
     void slotSetStartThumb(QImage img);
     void slotSetEndThumb(QImage img);
-    void slotSetStartThumb(QPixmap pix);
-    void slotSetEndThumb(QPixmap pix);
     void slotThumbReady(int frame, QPixmap pix);
 
+public slots:
+    void slotSetStartThumb(const QPixmap pix);
+    void slotSetEndThumb(const QPixmap pix);
+
 signals:
     void getThumb(int, int);
     void prepareAudioThumb(double, int, int, int);