X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fclipitem.h;h=ef81fe83d4f9a8129b54a143d0b0cbf01d98eb35;hb=04ddba2662bcac95f7dca733becc2d4bac6e5235;hp=8a1137d68d582a2407003549d2e4f422022cfb83;hpb=1d6a9b98d065ec3c2a1420667d00157a1373a82f;p=kdenlive

diff --git a/src/clipitem.h b/src/clipitem.h
index 8a1137d6..ef81fe83 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,
@@ -75,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);
@@ -85,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*);
 
@@ -126,7 +134,8 @@ public:
     void updateKeyframeEffect();
     QDomElement selectedEffect();
     int selectedEffectIndex() const;
-    void initEffect(QDomElement effect, int diff = 0);
+    
+    void initEffect(QDomElement effect, int diff = 0, int offset = 0);
 
     /** @brief Gets all keyframes.
     * @param index Number of the effect
@@ -147,6 +156,8 @@ public:
     const ItemInfo speedIndependantInfo() const;
     int hasEffect(const QString &tag, const QString &id) const;
 
+    /** @brief Adjust keyframes to the new clip. */
+    const QString adjustKeyframes(QString keyframes, int offset);
     /** @brief Makes sure all keyframes are in the clip's cropped duration.
     * @return Whether or not changes were made */
     bool checkKeyFrames();
@@ -161,7 +172,7 @@ public:
     void movedKeyframe(QDomElement effect, int oldpos, int newpos, double value);
     void updateKeyframes(QDomElement effect);
     void updateGeometryKeyframes(QDomElement effect, int paramIndex, int width, int height, ItemInfo oldInfo);
-    bool updateNormalKeyframes(QDomElement parameter);
+    bool updateNormalKeyframes(QDomElement parameter, ItemInfo oldInfo);
 
     /** @brief Adjusts effects after a clip duration change. */
     QMap<int, QDomElement> adjustEffectsToDuration(int width, int height, ItemInfo oldInfo);
@@ -172,6 +183,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);