summaryrefslogtreecommitdiff
path: root/gtk2_ardour/editor.h
diff options
context:
space:
mode:
Diffstat (limited to 'gtk2_ardour/editor.h')
-rw-r--r--gtk2_ardour/editor.h15
1 files changed, 11 insertions, 4 deletions
diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h
index ca5ab79bda..6122807fb6 100644
--- a/gtk2_ardour/editor.h
+++ b/gtk2_ardour/editor.h
@@ -1194,6 +1194,7 @@ class Editor : public PublicEditor
int scrubbing_direction;
int scrub_reversals;
int scrub_reverse_distance;
+ void scrub ();
void keyboard_selection_begin ();
void keyboard_selection_finish (bool add);
@@ -1218,6 +1219,8 @@ class Editor : public PublicEditor
void start_grab (GdkEvent*, Gdk::Cursor* cursor = 0);
bool end_grab (ArdourCanvas::Item*, GdkEvent*);
void swap_grab (ArdourCanvas::Item*, Gdk::Cursor* cursor, uint32_t time);
+ void break_drag ();
+ void finalize_drag ();
Gtk::Menu fade_context_menu;
void popup_fade_context_menu (int, int, ArdourCanvas::Item*, ItemType);
@@ -1727,15 +1730,19 @@ public:
bool autoscroll_active;
int autoscroll_timeout_tag;
- int autoscroll_direction;
+ int autoscroll_x;
+ int autoscroll_y;
+ int last_autoscroll_x;
+ int last_autoscroll_y;
uint32_t autoscroll_cnt;
- nframes_t autoscroll_distance;
+ nframes_t autoscroll_x_distance;
+ double autoscroll_y_distance;
static gint _autoscroll_canvas (void *);
bool autoscroll_canvas ();
- void start_canvas_autoscroll (int direction);
+ void start_canvas_autoscroll (int x, int y);
void stop_canvas_autoscroll ();
- void maybe_autoscroll (GdkEvent*);
+ void maybe_autoscroll (GdkEventMotion*);
/* trimming */
enum TrimOp {