Use VCA consistently in the GUI, rather than Control Master.

(manually cherry-pick Mixbus e62fc72 into ardour/master)

Author: pauldavisthefirst

gtk2_ardour/group_tabs.cc

@@ -362,8 +362,11 @@ GroupTabs::get_menu (RouteGroup* g, bool in_tab_area)
 		for (VCAList::const_iterator v = vcas.begin(); v != vcas.end(); ++v) {
 			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)));
 		}
+#ifdef MIXBUS
+		items.push_back (MenuElem (_("Assign Group to VCA..."), *vca_menu));
+#else
 		items.push_back (MenuElem (_("Assign Group to Control Master..."), *vca_menu));
-
+#endif
 
 		items.push_back (SeparatorElem());
 
@@ -398,7 +401,11 @@ GroupTabs::get_menu (RouteGroup* g, bool in_tab_area)
 		}
 	}
 
-	items.push_back (MenuElem (_("Assign Selection to Control Master..."), *vca_menu));
+#ifdef MIXBUS
+	items.push_back (MenuElem (_("Assign Selection to VCA..."), *vca_menu));
+#else
+	items.push_back (MenuElem (_("Assign Selection to VCA..."), *vca_menu));
+#endif
 
 	vca_menu = new Menu;
 	{
@@ -409,7 +416,11 @@ GroupTabs::get_menu (RouteGroup* g, bool in_tab_area)
 		}
 
 	}
-	items.push_back (MenuElem (_("Assign Record Enabled to Control Master..."), *vca_menu));
+#ifdef MIXBUS
+	items.push_back (MenuElem (_("Assign Record Enabled to VCA..."), *vca_menu));
+#else
+	items.push_back (MenuElem (_("Assign Record Enabled to VCA..."), *vca_menu));
+#endif
 
 	vca_menu = new Menu;
 	{
@@ -420,7 +431,11 @@ GroupTabs::get_menu (RouteGroup* g, bool in_tab_area)
 		}
 
 	}
-	items.push_back (MenuElem (_("Assign Soloed to Control Master..."), *vca_menu));
+#ifdef MIXBUS
+	items.push_back (MenuElem (_("Assign Soloed to VCA..."), *vca_menu));
+#else
+	items.push_back (MenuElem (_("Assign Soloed to VCA..."), *vca_menu));
+#endif
 
 	items.push_back (SeparatorElem());
 	items.push_back (MenuElem (_("Enable All Groups"), sigc::mem_fun(*this, &GroupTabs::activate_all)));