diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2017-01-28 13:03:43 +0100 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2017-01-28 13:04:32 +0100 |
| commit | 415c8416453df9cf7132d729fba26d55abcd3c45 (patch) | |
| tree | d4878deb0c869b8e18b284343ea8c266a3d3f22f /gtk2_ardour/group_tabs.cc | |
| parent | c0c13d7c4528f580b7512481a092711cefb270cf (diff) | |
more consisten code to set menu item name from VCA name
Diffstat (limited to 'gtk2_ardour/group_tabs.cc')
| -rw-r--r-- | gtk2_ardour/group_tabs.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gtk2_ardour/group_tabs.cc b/gtk2_ardour/group_tabs.cc index 58e69822db..94e7c8cfea 100644 --- 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()))); } } |