X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fclipitem.h;h=c5323905b182dc98a4dcaa76506a1c5de938f7a9;hb=b6f15d1f15f92794829559206e4e32eaf93b1329;hp=7e49dfdbae47159ae50036be77cbc35f26ff0a1f;hpb=ecda842bf2b632f75198d6cf0fac1fcb5ef862ad;p=kdenlive diff --git a/src/clipitem.h b/src/clipitem.h index 7e49dfdb..c5323905 100644 --- a/src/clipitem.h +++ b/src/clipitem.h @@ -46,7 +46,7 @@ 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, @@ -160,14 +160,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 updatePanZoom(int width, int height, int cut = 0); void updateGeometryKeyframes(QDomElement effect, int paramIndex, int width, int height, ItemInfo oldInfo); bool updateNormalKeyframes(QDomElement parameter); @@ -180,6 +172,7 @@ 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); protected: //virtual void mouseMoveEvent(QGraphicsSceneMouseEvent * event); @@ -226,6 +219,9 @@ private: QPixmap m_videoPix; QPixmap m_audioPix; + /** @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();