Fix wrong project clip deletion, fixes:

[kdenlive] / src / clipitem.h

diff --git a/src/clipitem.h b/src/clipitem.h
index 3c62293a81c3af3846285f384284c8bcb6e64bcd..98bd1c010df6760dc38ccd132b0b686407d31098 100644 (file)
--- a/src/clipitem.h
+++ b/src/clipitem.h
@@ -40,16 +40,16 @@ class ClipItem : public AbstractClipItem {
     Q_OBJECT
 
 public:
-    ClipItem(DocClipBase *clip, ItemInfo info, double fps);
+    ClipItem(DocClipBase *clip, ItemInfo info, double fps, 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);
-    int clipProducer() const;
+    const QString &clipProducer() const;
     int clipType() const;
     DocClipBase *baseClip() const;
     QString clipName() const;
@@ -96,6 +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);
@@ -112,7 +119,7 @@ private:
     DocClipBase *m_clip;
     OPERATIONTYPE m_resizeMode;
     int m_grabPoint;
-    int m_producer;
+    QString m_producer;
     CLIPTYPE m_clipType;
     QString m_clipName;
     QString m_effectNames;
@@ -126,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;
@@ -154,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);