X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fclipitem.h;h=59d0ce6d7d0cdafe3c575668ae2d7856d8f61752;hb=2cd321d36c5d172057c5095cc5f23ea92dedd11c;hp=9c6f4434fb02007cd84c30e2f6e6297992b23bae;hpb=715c1fea22e24373f70f6e39efbf17bba0c42334;p=kdenlive

diff --git a/src/clipitem.h b/src/clipitem.h
index 9c6f4434..59d0ce6d 100644
--- a/src/clipitem.h
+++ b/src/clipitem.h
@@ -39,14 +39,14 @@ class Transition;
 namespace Mlt
 {
 class Producer;
-};
+}
 
 class ClipItem : public AbstractClipItem
 {
     Q_OBJECT
 
 public:
-    ClipItem(DocClipBase *clip, ItemInfo info, double fps, double speed, int strobe, bool generateThumbs = true);
+    ClipItem(DocClipBase *clip, ItemInfo info, double fps, double speed, int strobe, int frame_width, bool generateThumbs = true);
     virtual ~ ClipItem();
     virtual void paint(QPainter *painter,
                        const QStyleOptionGraphicsItem *option,
@@ -55,6 +55,7 @@ public:
     void resizeStart(int posx, bool size = true);
     void resizeEnd(int posx);
     OPERATIONTYPE operationMode(QPointF pos);
+    static int itemHeight();
     const QString clipProducer() const;
     int clipType() const;
     DocClipBase *baseClip() const;
@@ -74,7 +75,7 @@ public:
 
     /** @brief Adds an effect to the clip.
     * @return The parameters that will be passed to Mlt */
-    EffectsParameterList addEffect(const QDomElement effect, bool animate = true);
+    EffectsParameterList addEffect(QDomElement effect, bool animate = true);
 
     /** @brief Deletes the effect with id @param index. */
     void deleteEffect(QString index);
@@ -84,21 +85,29 @@ public:
 
     /** @brief Gets a unique (?) effect id. */
     int effectsCounter();
+    
+        /** @brief Gets a copy of the xml of an effect.
+    * @param ix The effect's list index (starting from 0)
+    * @return A copy of the effect's xml */
+    QDomElement effect(int ix) const;
 
     /** @brief Gets a copy of the xml of an effect.
-    * @param ix The effect's index in effectlist
+    * @param ix The effect's index in effectlist (starting from 1)
     * @return A copy of the effect's xml */
-    QDomElement effectAt(int ix) const;
+    QDomElement effectAtIndex(int ix) const;
 
     /** @brief Gets the xml of an effect.
-    * @param ix The effect's index in effectlist
+    * @param ix The effect's index in effectlist (starting from 1)
     * @return The effect's xml */
-    QDomElement getEffectAt(int ix) const;
+    QDomElement getEffectAtIndex(int ix) const;
 
     /** @brief Replaces an effect.
     * @param ix The effect's index in effectlist
     * @param effect The new effect */
-    void setEffectAt(int ix, QDomElement effect);
+    void updateEffect(QDomElement effect);
+    /** @brief Enable / disable a list of effect from their indexes. */
+    void enableEffects(QList <int> indexes, bool disable);
+    bool moveEffect(QDomElement effect, int ix);
     void flashClip();
     void addTransition(Transition*);
 
@@ -159,14 +168,6 @@ public:
     void insertKeyframe(QDomElement effect, int pos, int val);
     void movedKeyframe(QDomElement effect, int oldpos, int newpos, double value);
     void updateKeyframes(QDomElement effect);
-    /** @brief Updates the keyframes in the pan and zoom effect to fit the clips cropDuration.
-     * @param width Render width
-     * @param height Render height
-     * @param cut (optional) if clip was cut, cut position relative to the original's clip position
-     * @return List of the pan and zoom effects indexes
-     * 
-     * Can be used for all effects using mlt_geometry with keyframes, but at the moment Pan & Zoom is the only one. */
-    QList <int> updatePanZoom(int width, int height, int cut = 0);
     void updateGeometryKeyframes(QDomElement effect, int paramIndex, int width, int height, ItemInfo oldInfo);
     bool updateNormalKeyframes(QDomElement parameter);
 
@@ -179,6 +180,12 @@ public:
      * @return Fitting producer
      * Which producer is returned depends on the type of this clip (audioonly, videoonly, normal) */
     Mlt::Producer *getProducer(int track, bool trackSpecific = true);
+    void resetFrameWidth(int width);
+    /** @brief Clip is about to be deleted, block thumbs. */
+    void stopThumbs();
+    
+    /** @brief Get a free index value for effect group. */
+    int nextFreeEffectGroupIndex() const;
 
 protected:
     //virtual void mouseMoveEvent(QGraphicsSceneMouseEvent * event);
@@ -225,7 +232,9 @@ private:
 
     QPixmap m_videoPix;
     QPixmap m_audioPix;
-    void doGetIntraThumbs(QPainter *painter, const QPointF startPos, int offset, int start, int end);
+    /** @brief Keyframes type can be "keyframe" or "simplekeyframe" which have to be painted differently.
+     * True if keyframe type is "keyframe" */
+    bool m_limitedKeyFrames;
 
 private slots:
     void slotGetStartThumb();
@@ -236,6 +245,8 @@ private slots:
     void slotSetStartThumb(QImage img);
     void slotSetEndThumb(QImage img);
     void slotThumbReady(int frame, QImage img);
+    /** @brief The thumbnailer has finished to cache all required thumbs. */
+    void slotGotThumbsCache();
 
 public slots:
     void slotFetchThumbs();