Mercurial > hg > svgui

diff view/Pane.h @ 804:5c4a405a70fc tony_integration

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from branch "tonioni"
author Chris Cannam
date Tue, 17 Jun 2014 12:55:18 +0100
parents 584b11df8e4f
children 40c6c9344ff6
line wrap: on
line diff
--- a/view/Pane.h	Tue Jun 17 12:55:10 2014 +0100
+++ b/view/Pane.h	Tue Jun 17 12:55:18 2014 +0100
@@ -91,6 +91,9 @@
     void mouseEnteredWidget();
     void mouseLeftWidget();
 
+protected slots:
+    void playbackScheduleTimerElapsed();
+
 protected:
     virtual void paintEvent(QPaintEvent *e);
     virtual void mousePressEvent(QMouseEvent *e);
@@ -139,6 +142,8 @@
 
     Layer *getTopFlexiNoteLayer();
 
+    void schedulePlaybackFrameMove(int frame);
+
     bool m_identifyFeatures;
     QPoint m_identifyPoint;
     QPoint m_clickPos;
@@ -184,6 +189,9 @@
 
     bool m_mouseInWidget;
 
+    bool m_playbackFrameMoveScheduled;
+    int m_playbackFrameMoveTo;
+
     static QCursor *m_measureCursor1;
     static QCursor *m_measureCursor2;
 };