diff options
| author | Nick Mainsbridge <beatroute@iprimus.com.au> | 2006-05-19 17:29:05 +0000 |
|---|---|---|
| committer | Nick Mainsbridge <beatroute@iprimus.com.au> | 2006-05-19 17:29:05 +0000 |
| commit | c33d0ad760e311c37cfcb99e48948cc92472ad55 (patch) | |
| tree | 29ee2b0b3647f0556b7b604a61d0d29f8a771851 /gtk2_ardour/mixer_strip.h | |
| parent | 06654aa7f10005d447d0829f149b9008c1abbcb6 (diff) | |
Mixer strip & ui layout changes
git-svn-id: svn://localhost/trunk/ardour2@514 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/mixer_strip.h')
| -rw-r--r-- | gtk2_ardour/mixer_strip.h | 34 |
1 files changed, 2 insertions, 32 deletions
diff --git a/gtk2_ardour/mixer_strip.h b/gtk2_ardour/mixer_strip.h index 32ff691583..67ad30bbe7 100644 --- a/gtk2_ardour/mixer_strip.h +++ b/gtk2_ardour/mixer_strip.h @@ -122,9 +122,10 @@ class MixerStrip : public RouteUI, public Gtk::EventBox RedirectBox pre_redirect_box; RedirectBox post_redirect_box; GainMeter gpm; - PannerUI panners; + PannerUI panners; Gtk::Table button_table; + Gtk::Table bottom_button_table; Gtk::Button diskstream_button; Gtk::Label diskstream_label; @@ -134,17 +135,6 @@ class MixerStrip : public RouteUI, public Gtk::EventBox Gtk::Button output_button; Gtk::Label output_label; - Gtk::Button gain_automation_style_button; - Gtk::ToggleButton gain_automation_state_button; - - Gtk::Button pan_automation_style_button; - Gtk::ToggleButton pan_automation_state_button; - - Gtk::Menu gain_astate_menu; - Gtk::Menu gain_astyle_menu; - Gtk::Menu pan_astate_menu; - Gtk::Menu pan_astyle_menu; - sigc::connection newplug_connection; gint mark_update_safe (); @@ -188,31 +178,13 @@ class MixerStrip : public RouteUI, public Gtk::EventBox void new_send (); void show_send_controls (); - - gint gain_automation_style_button_event (GdkEventButton *); - gint gain_automation_state_button_event (GdkEventButton *); - gint pan_automation_style_button_event (GdkEventButton *); - gint pan_automation_state_button_event (GdkEventButton *); - void input_changed (ARDOUR::IOChange, void *); void output_changed (ARDOUR::IOChange, void *); - void gain_automation_state_changed(); - void pan_automation_state_changed(); - void gain_automation_style_changed(); - void pan_automation_style_changed(); sigc::connection panstate_connection; sigc::connection panstyle_connection; void connect_to_pan (); - std::string astate_string (ARDOUR::AutoState); - std::string short_astate_string (ARDOUR::AutoState); - std::string _astate_string (ARDOUR::AutoState, bool); - - std::string astyle_string (ARDOUR::AutoStyle); - std::string short_astyle_string (ARDOUR::AutoStyle); - std::string _astyle_string (ARDOUR::AutoStyle, bool); - void update_diskstream_display (); void update_input_display (); void update_output_display (); @@ -260,8 +232,6 @@ class MixerStrip : public RouteUI, public Gtk::EventBox void map_frozen (); void hide_redirect_editor (ARDOUR::Redirect* redirect); - sigc::connection gain_watching; - sigc::connection pan_watching; bool ignore_speed_adjustment; string solo_button_name () const { return "MixerSoloButton"; } |