additional DEBUG_TRACE output for slave/diskreader

[ardour.git] / gtk2_ardour / group_tabs.cc

diff --git a/gtk2_ardour/group_tabs.cc b/gtk2_ardour/group_tabs.cc
index 9f82824737a0f8d38b9f220c16fe3802ceaca072..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();
@@ -525,6 +527,9 @@ GroupTabs::assign_some_to_master (uint32_t which, RouteList rl)
        for (RouteList::iterator r = rl.begin(); r != rl.end(); ++r) {
                (*r)->assign (master);
        }
+       if (set_name && !vcaname.empty()) {
+               master->set_name (vcaname);
+       }
 }
 
 RouteList
@@ -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