X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Ftransition.h;h=e779665512258ab55cf0ea70965724751461ccab;hb=32c8c40056e65b230f058b168e8e078ba066038b;hp=49b90e0637dee857ee7dc70ac2f4aaf8a31fa5e5;hpb=1638e2102044baead0d085bdc9b5b2e7954ce4fb;p=kdenlive diff --git a/src/transition.h b/src/transition.h index 49b90e06..e7796655 100644 --- a/src/transition.h +++ b/src/transition.h @@ -53,9 +53,6 @@ public: /** @brief Returns the track number of the transition in the playlist. */ int transitionEndTrack() const; - bool hasClip(const ClipItem * clip) const; - bool belongsToClip(const ClipItem * clip) const; - bool invertedTransition() const; QString transitionTag() const; QStringList transitionInfo() const; OPERATIONTYPE operationMode(QPointF pos); @@ -63,10 +60,7 @@ public: static int itemOffset(); //const QMap < QString, QString > transitionParameters() const; void setTransitionParameters(const QDomElement params); - void setTransitionDirection(bool inv); void setTransitionTrack(int track); - //Transition *reparent(ClipItem * clip); - bool isValid() const; /** @brief Links the transition to another track. * @@ -74,15 +68,16 @@ public: void updateTransitionEndTrack(int newtrack); void setForcedTrack(bool force, int track); bool forcedTrack() const; - const ClipItem *referencedClip() const; Transition *clone(); bool isAutomatic() const; void setAutomatic(bool automatic); bool hasGeometry(); int defaultZValue() const; - /** @brief When a transition is resized, check if keyframes are out of the transition and fix if necessary. */ - bool updateKeyframes(); - void animate(); + /** @brief When a transition is resized, check if keyframes are out of the transition and fix if necessary. + * @param oldEnd the previous transition end, so that when we expand the transition, if there is a keyframe at end we move it + */ + bool updateKeyframes(int oldEnd); + protected: virtual QVariant itemChange(GraphicsItemChange change, const QVariant &value); @@ -96,11 +91,6 @@ private: /** @brief Contains the transition parameters. */ QDomElement m_parameters; - /** @brief The clip to which the transition is attached. */ - ClipItem *m_referenceClip; - - /** @brief The second clip to which the transition is attached. */ - ClipItem *m_secondClip; int m_transitionTrack; /** @brief Returns the display name for a transition type. */