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/add_route_dialog.cc | |
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/add_route_dialog.cc')
-rw-r--r-- | gtk2_ardour/add_route_dialog.cc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/gtk2_ardour/add_route_dialog.cc b/gtk2_ardour/add_route_dialog.cc index c08120dd85..06dc51dc83 100644 --- a/gtk2_ardour/add_route_dialog.cc +++ b/gtk2_ardour/add_route_dialog.cc @@ -84,12 +84,12 @@ AddRouteDialog::AddRouteDialog (Session & s) refill_channel_setups (); set_popdown_strings (track_mode_combo, track_mode_strings, true); - edit_group_combo.append_text (_("No group")); - _session.foreach_edit_group (mem_fun (*this, &AddRouteDialog::add_edit_group)); + route_group_combo.append_text (_("No group")); + _session.foreach_route_group (mem_fun (*this, &AddRouteDialog::add_route_group)); channel_combo.set_active_text (channel_combo_strings.front()); track_mode_combo.set_active_text (track_mode_strings.front()); - edit_group_combo.set_active (0); + route_group_combo.set_active (0); RadioButton::Group g = track_button.get_group(); bus_button.set_group (g); @@ -134,7 +134,7 @@ AddRouteDialog::AddRouteDialog (Session & s) l = manage (new Label (_("Add to edit group:"))); l->set_alignment (1, 0.5); table->attach (*l, 0, 1, 4, 5); - table->attach (edit_group_combo, 1, 2, 4, 5, FILL | EXPAND); + table->attach (route_group_combo, 1, 2, 4, 5, FILL | EXPAND); get_vbox()->pack_start (*table); get_vbox()->set_spacing (6); @@ -325,17 +325,17 @@ AddRouteDialog::refill_channel_setups () } void -AddRouteDialog::add_edit_group (RouteGroup* g) +AddRouteDialog::add_route_group (RouteGroup* g) { - edit_group_combo.append_text (g->name ()); + route_group_combo.append_text (g->name ()); } RouteGroup* -AddRouteDialog::edit_group () +AddRouteDialog::route_group () { - if (edit_group_combo.get_active_row_number () == 0) { + if (route_group_combo.get_active_row_number () == 0) { return 0; } - return _session.edit_group_by_name (edit_group_combo.get_active_text()); + return _session.route_group_by_name (route_group_combo.get_active_text()); } |