PBD::Signal<...>::connect() is already thread safe, so drop intermediate proxy/call_s...

[ardour.git] / gtk2_ardour / group_tabs.cc

diff --git a/gtk2_ardour/group_tabs.cc b/gtk2_ardour/group_tabs.cc
index 58e69822db4f64af631edb05540190621d3e4658..03a557a03ba22d1cb8f7bcf9166d795ec0dcef89 100644 (file)
--- a/gtk2_ardour/group_tabs.cc
+++ b/gtk2_ardour/group_tabs.cc
@@ -144,10 +144,10 @@ GroupTabs::on_button_press_event (GdkEventButton* ev)
 
                RouteGroup* g = t ? t->group : 0;
 
-               if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier) && g) {
-                       /* edit */
-                       RouteGroupDialog d (g, false);
-                       d.present ();
+               if (Keyboard::modifier_state_equals (ev->state, Keyboard::TertiaryModifier) && g) {
+                       remove_group (g);
+               } else if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier) && g) {
+                       edit_group (g);
                } else {
                        Menu* m = get_menu (g, true);
                        if (m) {
@@ -360,9 +360,9 @@ 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));
+               items.push_back (MenuElem (_("Assign Group to VCA..."), *vca_menu));
 
 
                items.push_back (SeparatorElem());
@@ -394,33 +394,33 @@ 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())));
                }
        }
 
-       items.push_back (MenuElem (_("Assign Selection to Control Master..."), *vca_menu));
+       items.push_back (MenuElem (_("Assign Selection to VCA..."), *vca_menu));
 
        vca_menu = new Menu;
        {
                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())));
                }
 
        }
-       items.push_back (MenuElem (_("Assign Record Enabled to Control Master..."), *vca_menu));
+       items.push_back (MenuElem (_("Assign Record Enabled to VCA..."), *vca_menu));
 
        vca_menu = new Menu;
        {
                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())));
                }
 
        }
-       items.push_back (MenuElem (_("Assign Soloed to Control Master..."), *vca_menu));
+       items.push_back (MenuElem (_("Assign Soloed to VCA..."), *vca_menu));
 
        items.push_back (SeparatorElem());
        items.push_back (MenuElem (_("Enable All Groups"), sigc::mem_fun(*this, &GroupTabs::activate_all)));
@@ -500,7 +500,7 @@ GroupTabs::assign_some_to_master (uint32_t which, RouteList rl)
        }
 
        for (RouteList::iterator r = rl.begin(); r != rl.end(); ++r) {
-               (*r)->assign (master);
+               (*r)->assign (master, false);
        }
 }