Merge branch 'master' into feature/pkey

[kdenlive] / src / abstractclipitem.h

diff --git a/src/abstractclipitem.h b/src/abstractclipitem.h
index b04f5712632e00fdd689485d6a0a7fb77ee3a108..8703c919bcff6fbff4d96b2cdb265679963a49d0 100644 (file)
--- a/src/abstractclipitem.h
+++ b/src/abstractclipitem.h
@@ -37,20 +37,18 @@ class QGraphicsSceneMouseEvent;
 class AbstractClipItem : public QObject, public QGraphicsRectItem
 {
     Q_OBJECT
-#if QT_VERSION >= 0x040600
     Q_PROPERTY(QRectF rect READ rect WRITE setRect)
-#endif
 
 public:
-    AbstractClipItem(const ItemInfo info, const QRectF& rect, double fps);
+    AbstractClipItem(const ItemInfo &info, const QRectF& rect, double fps);
     virtual ~ AbstractClipItem();
     void updateSelectedKeyFrame();
 
     /** @brief Move the selected keyframe (does not influence the effect, only the display in timeline).
     * @param pos new Position
     * @param value new Value */
-    void updateKeyFramePos(const GenTime pos, const double value);
-    int addKeyFrame(const GenTime pos, const double value);
+    void updateKeyFramePos(const GenTime &pos, const double value);
+    int addKeyFrame(const GenTime &pos, const double value);
     bool hasKeyFrames() const;
     int editedKeyFramePos() const;
     int selectedKeyFramePos() const;
@@ -75,6 +73,11 @@ public:
     virtual int track() const ;
     virtual GenTime cropStart() const ;
     virtual GenTime cropDuration() const ;
+    /** @brief Return the current item's height */
+    static int itemHeight();
+    /** @brief Return the current item's vertical offset
+     *         For example transitions are drawn at 1/3 of track height */
+    static int itemOffset();
 
     /** @brief Resizes the clip from the start.
     * @param posx Absolute position of new in point
@@ -110,15 +113,16 @@ protected:
     /** The (keyframe) parameter that is visible and editable in timeline (on the clip) */
     int m_visibleParam;
     double m_fps;
-    //QRect visibleRect();
-    void drawKeyFrames(QPainter *painter, QRectF exposedRect);
+    /** @brief Draw the keyframes of a clip
+      * @param painter The painter device for the clip
+      * @param limitedKeyFrames The keyframes can be of type "keyframe" or "simplekeyframe". In the
+      *        "simplekeyframe" type, the effect always starts on clip start and ends on clip end. With the
+      *        "keyframe" type, the effect starts on the first keyframe and ends on the last keyframe
+      */
+    void drawKeyFrames(QPainter *painter, bool limitedKeyFrames);
     int mouseOverKeyFrames(QPointF pos, double maxOffset);
     virtual void mousePressEvent(QGraphicsSceneMouseEvent * event);
 
-private:
-#if QT_VERSION >= 0x040600
-    QPropertyAnimation *m_closeAnimation;
-#endif
 };
 
 #endif