Various fixes to improve general stability in Qt 4.5.2

[kdenlive] / src / abstractclipitem.h

diff --git a/src/abstractclipitem.h b/src/abstractclipitem.h
index 6c35b726dc0318284983e08e0af6e45c5f6259ee..231cf94659701b2885c08cc65f632d551196b30b 100644 (file)
--- a/src/abstractclipitem.h
+++ b/src/abstractclipitem.h
@@ -25,25 +25,37 @@
 #include "definitions.h"
 #include "gentime.h"
 
-class AbstractClipItem : public QObject , public QGraphicsRectItem {
+class CustomTrackScene;
+class QGraphicsSceneMouseEvent;
+
+class AbstractClipItem : public QObject , public QGraphicsRectItem
+{
     Q_OBJECT
 public:
     AbstractClipItem(const ItemInfo info, const QRectF& rect, double fps);
     void updateSelectedKeyFrame();
-    void updateKeyFramePos(const GenTime pos, const int value);
-    void addKeyFrame(const GenTime pos, const int value);
+    void updateKeyFramePos(const GenTime pos, const double value);
+    void addKeyFrame(const GenTime pos, const double value);
     bool hasKeyFrames() const;
+    int selectedKeyFramePos() const;
+    double selectedKeyFrameValue() const;
+    double keyFrameFactor() const;
+    ItemInfo info() const;
+    CustomTrackScene* projectScene();
+    void updateRectGeometry();
+    void updateItem();
+    void setItemLocked(bool locked);
+    bool isItemLocked() const;
 
-    virtual  OPERATIONTYPE operationMode(QPointF pos, double scale) = 0;
+    virtual  OPERATIONTYPE operationMode(QPointF pos) = 0;
     virtual GenTime startPos() const ;
     virtual void setTrack(int track);
     virtual GenTime endPos() const ;
     virtual int track() const ;
-    virtual void moveTo(int x, double scale, int offset, int newTrack);
     virtual GenTime cropStart() const ;
-    virtual void resizeStart(int posx, double scale);
-    virtual void resizeEnd(int posx, double scale);
-    virtual GenTime duration() const;
+    virtual GenTime cropDuration() const ;
+    virtual void resizeStart(int posx, double speed = 1.0);
+    virtual void resizeEnd(int posx, double speed = 1.0, bool updateKeyFrames = true);
     virtual double fps() const;
     virtual GenTime maxDuration() const;
     virtual void setCropStart(GenTime pos);
@@ -56,13 +68,14 @@ protected:
     GenTime m_cropDuration;
     GenTime m_startPos;
     GenTime m_maxDuration;
-    QMap <int, double> m_keyframes;
+    QMap <int, int> m_keyframes;
+    double m_keyframeFactor;
+    double m_keyframeDefault;
     double m_fps;
-    QPainterPath upperRectPart(QRectF);
-    QPainterPath lowerRectPart(QRectF);
-    QRect visibleRect();
+    //QRect visibleRect();
     void drawKeyFrames(QPainter *painter, QRectF exposedRect);
     int mouseOverKeyFrames(QPointF pos);
+    virtual void mousePressEvent(QGraphicsSceneMouseEvent * event);
 };
 
 #endif