Ensure that all base constructors are explicitly called.

[kdenlive] / src / clipitem.h

diff --git a/src/clipitem.h b/src/clipitem.h
index 8a3d4a2c72e719ff116e54a736cfecd98c920ade..63acdc16ee01efb7bb0e71f15819b18fe7a12f66 100644 (file)
--- a/src/clipitem.h
+++ b/src/clipitem.h
@@ -36,23 +36,25 @@ class DocClipBase;
 class Transition;
 
 
-class ClipItem : public AbstractClipItem {
+class ClipItem : public AbstractClipItem
+{
     Q_OBJECT
 
 public:
-    ClipItem(DocClipBase *clip, ItemInfo info, double fps, bool generateThumbs = true);
+    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, bool updateKeyFrames = true);
+    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;
     DocClipBase *baseClip() const;
     QString clipName() const;
+    void setClipName(const QString &name);
     QDomElement xml() const;
     ClipItem *clone(ItemInfo info) const;
     const EffectsList effectList();
@@ -61,9 +63,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,8 +98,17 @@ 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;
+    void setVideoOnly(bool force);
+    void setAudioOnly(bool force);
+    bool isVideoOnly() const;
+    bool isAudioOnly() const;
 
 protected:
     //virtual void mouseMoveEvent(QGraphicsSceneMouseEvent * event);
@@ -121,6 +132,8 @@ private:
     uint m_startFade;
     uint m_endFade;
     int m_maxTrack;
+    bool m_audioOnly;
+    bool m_videoOnly;
 
     QPixmap m_startPix;
     QPixmap m_endPix;
@@ -144,6 +157,8 @@ private:
     QMap<int, QPainterPath > channelPaths;
     /** 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;
 
 private slots:
     void slotFetchThumbs();
@@ -154,10 +169,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);