diff options
| author | Carl Hetherington <carl@carlh.net> | 2009-06-21 19:59:56 +0000 |
|---|---|---|
| committer | Carl Hetherington <carl@carlh.net> | 2009-06-21 19:59:56 +0000 |
| commit | 955d731fa6933e6769986687a781d16f7889da67 (patch) | |
| tree | 84a383627ac0a9548f5b789b17740915846e5dcf /gtk2_ardour/mixer_ui.h | |
| parent | 8cd536ab85b5923fe97d32cb93c913420fbaf5bf (diff) | |
Merge edit and mix groups to just being route groups. Add properties to route groups to decide what things their member routes will share. Allow edits to happen across a route group without its tracks necessarily being selected.
git-svn-id: svn://localhost/ardour2/branches/3.0@5236 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/mixer_ui.h')
| -rw-r--r-- | gtk2_ardour/mixer_ui.h | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/gtk2_ardour/mixer_ui.h b/gtk2_ardour/mixer_ui.h index 014d69ee06..673a619594 100644 --- a/gtk2_ardour/mixer_ui.h +++ b/gtk2_ardour/mixer_ui.h @@ -175,21 +175,21 @@ class Mixer_UI : public Gtk::Window void show_all_audiotracks(); void hide_all_audiotracks (); - Gtk::Menu* mix_group_context_menu; + Gtk::Menu* route_group_context_menu; bool in_group_row_change; void group_selected (gint row, gint col, GdkEvent *ev); void group_unselected (gint row, gint col, GdkEvent *ev); void group_display_active_clicked(); - void new_mix_group (); - void remove_selected_mix_group (); - void build_mix_group_context_menu (); - void activate_all_mix_groups (); - void disable_all_mix_groups (); - void add_mix_group (ARDOUR::RouteGroup *); - void mix_groups_changed (); - void mix_group_name_edit (const Glib::ustring&, const Glib::ustring&); - void mix_group_row_change (const Gtk::TreeModel::Path& path,const Gtk::TreeModel::iterator& iter); + void new_route_group (); + void remove_selected_route_group (); + void build_route_group_context_menu (); + void activate_all_route_groups (); + void disable_all_route_groups (); + void add_route_group (ARDOUR::RouteGroup *); + void route_groups_changed (); + void route_group_name_edit (const Glib::ustring&, const Glib::ustring&); + void route_group_row_change (const Gtk::TreeModel::Path& path,const Gtk::TreeModel::iterator& iter); Gtk::Menu *track_menu; void track_column_click (gint); @@ -218,12 +218,10 @@ class Mixer_UI : public Gtk::Window struct GroupDisplayModelColumns : public Gtk::TreeModel::ColumnRecord { GroupDisplayModelColumns() { - add (active); add (visible); add (text); add (group); } - Gtk::TreeModelColumn<bool> active; Gtk::TreeModelColumn<bool> visible; Gtk::TreeModelColumn<Glib::ustring> text; Gtk::TreeModelColumn<ARDOUR::RouteGroup*> group; @@ -253,6 +251,7 @@ class Mixer_UI : public Gtk::Window bool ignore_sync; void parameter_changed (std::string const &); + void set_route_group_activation (ARDOUR::RouteGroup *, bool); static const int32_t default_width = 478; static const int32_t default_height = 765; |