diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2006-04-10 03:54:00 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2006-04-10 03:54:00 +0000 |
| commit | a157537898eccf08009281633b19970515366a78 (patch) | |
| tree | cd6f7bb1e7f9bddba1b5cc4ce6e10c60cb2b2a46 /gtk2_ardour/ardour_ui.h | |
| parent | 7e8a98224578e03e17fbf5e656241ff5ef1a0bc1 (diff) | |
a) moved metering and meter falloff code into libardour
b) added initial "big meter" mode for tranzport
c) fixed some lock issues in ARDOUR::IO objects
d) generic_midi control surface module now compiles and loads
git-svn-id: svn://localhost/trunk/ardour2@450 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/ardour_ui.h')
| -rw-r--r-- | gtk2_ardour/ardour_ui.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h index bca41f6ca7..cff822e2f3 100644 --- a/gtk2_ardour/ardour_ui.h +++ b/gtk2_ardour/ardour_ui.h @@ -87,6 +87,7 @@ namespace ARDOUR { class Route; class Port; class IO; + class ControlProtocolInfo; }; namespace ALSA { @@ -491,6 +492,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI Gtk::HBox menu_hbox; void build_menu_bar (); + void build_control_surface_menu (); void pack_toplevel_controls(); Gtk::Label wall_clock_label; @@ -505,10 +507,6 @@ class ARDOUR_UI : public Gtkmm2ext::UI Gtk::EventBox cpu_load_box; void update_cpu_load (); - Gtk::Label disk_rate_label; - Gtk::EventBox disk_rate_box; - void update_disk_rate(); - Gtk::Label buffer_load_label; Gtk::EventBox buffer_load_box; void update_buffer_load (); @@ -718,7 +716,8 @@ class ARDOUR_UI : public Gtkmm2ext::UI void map_some_session_state (const char* group, const char* action, bool (ARDOUR::Session::*get)() const); void queue_session_control_changed (ARDOUR::Session::ControlType t); void session_control_changed (ARDOUR::Session::ControlType t); - + + void toggle_control_protocol (ARDOUR::ControlProtocolInfo*); }; |