a-fluidsynth: implement LV2_BANKPATCH__notify

[ardour.git] / gtk2_ardour / group_tabs.cc

diff --git a/gtk2_ardour/group_tabs.cc b/gtk2_ardour/group_tabs.cc
index 3adce69bf9512132d0b0969793784018dd0251b1..63d8d5925691cdf4ad4c4d599790b72b948c47f3 100644 (file)
--- a/gtk2_ardour/group_tabs.cc
+++ b/gtk2_ardour/group_tabs.cc
@@ -489,19 +489,21 @@ GroupTabs::unassign_group_to_master (uint32_t which, RouteGroup* group) const
 }
 
 void
-GroupTabs::assign_some_to_master (uint32_t which, RouteList rl)
+GroupTabs::assign_some_to_master (uint32_t which, RouteList rl, std::string vcaname)
 {
        if (!_session) {
                return;
        }
 
        boost::shared_ptr<VCA> master;
+       bool set_name = false;
 
        if (which == 0) {
                if (_session->vca_manager().create_vca (1)) {
                        /* error */
                        return;
                }
+               set_name = true;
 
                /* Get most recently created VCA... */
                which = _session->vca_manager().vcas().back()->number();
@@ -523,7 +525,10 @@ GroupTabs::assign_some_to_master (uint32_t which, RouteList rl)
        }
 
        for (RouteList::iterator r = rl.begin(); r != rl.end(); ++r) {
-               (*r)->assign (master, false);
+               (*r)->assign (master);
+       }
+       if (set_name && !vcaname.empty()) {
+               master->set_name (vcaname);
        }
 }
 
@@ -568,7 +573,7 @@ GroupTabs::get_soloed ()
 void
 GroupTabs::assign_selection_to_master (uint32_t which)
 {
-       assign_some_to_master (which, selected_routes ());
+       assign_some_to_master (which, selected_routes (), _("Selection"));
 }
 
 void
@@ -679,12 +684,12 @@ void
 GroupTabs::collect (RouteGroup* g)
 {
        boost::shared_ptr<RouteList> group_routes = g->route_list ();
-       group_routes->sort (Stripable::PresentationOrderSorter());
+       group_routes->sort (Stripable::Sorter());
        int const N = group_routes->size ();
 
        RouteList::iterator i = group_routes->begin ();
        boost::shared_ptr<RouteList> routes = _session->get_routes ();
-       routes->sort (Stripable::PresentationOrderSorter());
+       routes->sort (Stripable::Sorter());
        RouteList::const_iterator j = routes->begin ();
 
        int diff = 0;
@@ -745,10 +750,10 @@ GroupTabs::set_activation (RouteGroup* g, bool a)
 void
 GroupTabs::remove_group (RouteGroup* g)
 {
-       RouteList rl (*(g->route_list().get()));
+       boost::shared_ptr<RouteList> rl (g->route_list ());
        _session->remove_route_group (*g);
 
-       emit_gui_changed_for_members (g);
+       emit_gui_changed_for_members (rl);
 }
 
 /** Set the color of the tab of a route group */
@@ -822,7 +827,7 @@ GroupTabs::route_group_property_changed (RouteGroup* rg)
           for our routes.
        */
 
-       emit_gui_changed_for_members (rg);
+       emit_gui_changed_for_members (rg->route_list ());
 
        set_dirty ();
 }
@@ -858,11 +863,11 @@ GroupTabs::route_removed_from_route_group (RouteGroup*, boost::weak_ptr<Route> w
 }
 
 void
-GroupTabs::emit_gui_changed_for_members (RouteGroup* rg)
+GroupTabs::emit_gui_changed_for_members (boost::shared_ptr<RouteList> rl)
 {
        PresentationInfo::ChangeSuspender cs;
 
-       for (RouteList::iterator i = rg->route_list()->begin(); i != rg->route_list()->end(); ++i) {
+       for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) {
                (*i)->presentation_info().PropertyChanged (Properties::color);
        }
 }