stability update: make sure we don't interrupt MLT when we just requested a consumer...

[kdenlive] / src / customruler.h

diff --git a/src/customruler.h b/src/customruler.h
index c36cdd3f7e01707c235bca38e0045007f74468d5..abdc5944eef98479ba7c088e5f30a50dd0172da7 100644 (file)
--- a/src/customruler.h
+++ b/src/customruler.h
@@ -49,12 +49,15 @@ public:
     int offset() const;
     void updateProjectFps(Timecode t);
     void updateFrameSize();
+    void updatePalette();
+    
 protected:
     virtual void paintEvent(QPaintEvent * /*e*/);
     virtual void wheelEvent(QWheelEvent * e);
     virtual void mousePressEvent(QMouseEvent * event);
     virtual void mouseReleaseEvent(QMouseEvent * event);
     virtual void mouseMoveEvent(QMouseEvent * event);
+    virtual void leaveEvent(QEvent * event);
 
 private:
     Timecode m_timecode;
@@ -62,13 +65,12 @@ private:
     int m_zoneStart;
     int m_zoneEnd;
     int m_duration;
-    QColor m_bgColor;
-    QColor m_cursorColor;
     QColor m_zoneColor;
     double m_textSpacing;
     double m_factor;
     double m_scale;
     int m_offset;
+    int m_lastSeekPosition;
     RULER_MOVE m_moveCursor;
     QMenu *m_contextMenu;
     QAction *m_editGuide;
@@ -80,11 +82,13 @@ private:
     int m_startRate;
     MOUSE_MOVE m_mouseMove;
     QMenu *m_goMenu;
+    QBrush m_cursorColor;
 
 
 public slots:
     void slotMoveRuler(int newPos);
     void slotCursorMoved(int oldpos, int newpos);
+    void updateRuler();
 
 private slots:
     void slotEditGuide();