more consisten code to set menu item name from VCA name

[ardour.git] / gtk2_ardour / group_tabs.cc

diff --git a/gtk2_ardour/group_tabs.cc b/gtk2_ardour/group_tabs.cc
index 58e69822db4f64af631edb05540190621d3e4658..94e7c8cfea23eb566d12dba134d40beb2f86013e 100644 (file)
--- a/gtk2_ardour/group_tabs.cc
+++ b/gtk2_ardour/group_tabs.cc
@@ -360,7 +360,7 @@ GroupTabs::get_menu (RouteGroup* g, bool in_tab_area)
                f.push_back (MenuElem ("New", sigc::bind (sigc::mem_fun (*this, &GroupTabs::assign_group_to_master), 0, g, true)));
 
                for (VCAList::const_iterator v = vcas.begin(); v != vcas.end(); ++v) {
-                       f.push_back (MenuElem (string_compose ("VCA %1", (*v)->number()), sigc::bind (sigc::mem_fun (*this, &GroupTabs::assign_group_to_master), (*v)->number(), g, true)));
+                       f.push_back (MenuElem ((*v)->name().empty() ? string_compose ("VCA %1", (*v)->number()) : (*v)->name(), sigc::bind (sigc::mem_fun (*this, &GroupTabs::assign_group_to_master), (*v)->number(), g, true)));
                }
                items.push_back (MenuElem (_("Assign Group to Control Master..."), *vca_menu));
 
@@ -394,7 +394,7 @@ GroupTabs::get_menu (RouteGroup* g, bool in_tab_area)
                MenuList& f (vca_menu->items());
                f.push_back (MenuElem ("New", sigc::bind (sigc::mem_fun (*this, &GroupTabs::assign_selection_to_master), 0)));
                for (VCAList::const_iterator v = vcas.begin(); v != vcas.end(); ++v) {
-                       f.push_back (MenuElem (((*v)->name().empty() ? string_compose ("VCA %1", (*v)->number()) : string_compose ("%1",(*v)->name())), sigc::bind (sigc::mem_fun (*this, &GroupTabs::assign_selection_to_master), (*v)->number())));
+                       f.push_back (MenuElem ((*v)->name().empty() ? string_compose ("VCA %1", (*v)->number()) : (*v)->name(), sigc::bind (sigc::mem_fun (*this, &GroupTabs::assign_selection_to_master), (*v)->number())));
                }
        }
 
@@ -405,7 +405,7 @@ GroupTabs::get_menu (RouteGroup* g, bool in_tab_area)
                MenuList& f (vca_menu->items());
                f.push_back (MenuElem ("New", sigc::bind (sigc::mem_fun (*this, &GroupTabs::assign_recenabled_to_master), 0)));
                for (VCAList::const_iterator v = vcas.begin(); v != vcas.end(); ++v) {
-                       f.push_back (MenuElem (((*v)->name().empty() ? string_compose ("VCA %1", (*v)->number()) : string_compose ("%1",(*v)->name())), sigc::bind (sigc::mem_fun (*this, &GroupTabs::assign_recenabled_to_master), (*v)->number())));
+                       f.push_back (MenuElem ((*v)->name().empty() ? string_compose ("VCA %1", (*v)->number()) : (*v)->name(), sigc::bind (sigc::mem_fun (*this, &GroupTabs::assign_recenabled_to_master), (*v)->number())));
                }
 
        }
@@ -416,7 +416,7 @@ GroupTabs::get_menu (RouteGroup* g, bool in_tab_area)
                MenuList& f (vca_menu->items());
                f.push_back (MenuElem ("New", sigc::bind (sigc::mem_fun (*this, &GroupTabs::assign_soloed_to_master), 0)));
                for (VCAList::const_iterator v = vcas.begin(); v != vcas.end(); ++v) {
-                       f.push_back (MenuElem (((*v)->name().empty() ? string_compose ("VCA %1", (*v)->number()) : string_compose ("%1",(*v)->name())), sigc::bind (sigc::mem_fun (*this, &GroupTabs::assign_soloed_to_master), (*v)->number())));
+                       f.push_back (MenuElem ((*v)->name().empty() ? string_compose ("VCA %1", (*v)->number()) : (*v)->name(), sigc::bind (sigc::mem_fun (*this, &GroupTabs::assign_soloed_to_master), (*v)->number())));
                }
 
        }