summaryrefslogtreecommitdiff
path: root/gtk2_ardour/editor.h
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2006-04-06 16:51:27 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2006-04-06 16:51:27 +0000
commite9f9ca5278c6bcafd6a22ad273185c31664c32a5 (patch)
tree6000ae75223bfa5b2f476337558e3a20923641bd /gtk2_ardour/editor.h
parent06764a3b0704e06ec8de42533938b1b50ab1ad4d (diff)
3 different data wheel modes for tranzport, plus lock on writes, and more
git-svn-id: svn://localhost/trunk/ardour2@448 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/editor.h')
-rw-r--r--gtk2_ardour/editor.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h
index 92b21c0757..1b0a1a4811 100644
--- a/gtk2_ardour/editor.h
+++ b/gtk2_ardour/editor.h
@@ -150,7 +150,6 @@ class Editor : public PublicEditor
void connect_to_image_compositor() ;
void scroll_timeaxis_to_imageframe_item(const TimeAxisViewItem* item) ;
TimeAxisView* get_named_time_axis(const string & name) ;
- /* </CMT Additions> */
void consider_auditioning (ARDOUR::Region&);
void hide_a_region (ARDOUR::Region&);
@@ -322,7 +321,7 @@ class Editor : public PublicEditor
void ensure_float (Gtk::Window&);
void show_window ();
-
+
void scroll_tracks_down_line ();
void scroll_tracks_up_line ();
@@ -715,6 +714,10 @@ class Editor : public PublicEditor
Gtk::VBox edit_controls_vbox;
Gtk::HBox edit_controls_hbox;
+ void control_scroll (float);
+ bool deferred_control_scroll (jack_nframes_t);
+ sigc::connection control_scroll_connection;
+
void tie_vertical_scrolling ();
void canvas_horizontally_scrolled ();
void reposition_and_zoom (jack_nframes_t sample, double fpu);