From 5b7ed60dabd75876e6c260dbc6a1cf56fb3d9a82 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 22 Jun 2009 21:05:14 +0000 Subject: [PATCH] Pick up newly-added route groups correctly. git-svn-id: svn://localhost/ardour2/branches/3.0@5247 d708f5d6-7413-0410-9779-e7cbd77b26cf --- gtk2_ardour/add_route_dialog.cc | 17 +++++++++++++---- gtk2_ardour/add_route_dialog.h | 1 + 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/gtk2_ardour/add_route_dialog.cc b/gtk2_ardour/add_route_dialog.cc index 06dc51dc83..a8523f97f2 100644 --- a/gtk2_ardour/add_route_dialog.cc +++ b/gtk2_ardour/add_route_dialog.cc @@ -82,14 +82,11 @@ AddRouteDialog::AddRouteDialog (Session & s) routes_spinner.set_name ("AddRouteDialogSpinner"); refill_channel_setups (); + refill_route_groups (); set_popdown_strings (track_mode_combo, track_mode_strings, true); - 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()); - route_group_combo.set_active (0); RadioButton::Group g = track_button.get_group(); bus_button.set_group (g); @@ -250,6 +247,8 @@ void AddRouteDialog::on_show () { refill_channel_setups (); + refill_route_groups (); + Dialog::on_show (); } @@ -339,3 +338,13 @@ AddRouteDialog::route_group () return _session.route_group_by_name (route_group_combo.get_active_text()); } + +void +AddRouteDialog::refill_route_groups () +{ + route_group_combo.clear (); + route_group_combo.append_text (_("No group")); + _session.foreach_route_group (mem_fun (*this, &AddRouteDialog::add_route_group)); + route_group_combo.set_active (0); +} + diff --git a/gtk2_ardour/add_route_dialog.h b/gtk2_ardour/add_route_dialog.h index 6103cec80c..1221b64ba4 100644 --- a/gtk2_ardour/add_route_dialog.h +++ b/gtk2_ardour/add_route_dialog.h @@ -67,6 +67,7 @@ class AddRouteDialog : public Gtk::Dialog void track_type_chosen (); void refill_channel_setups (); + void refill_route_groups (); void add_route_group (ARDOUR::RouteGroup *); void reset_template_option_visibility ();