Manage some Menus (memory leaks)

[ardour.git] / gtk2_ardour / group_tabs.cc

diff --git a/gtk2_ardour/group_tabs.cc b/gtk2_ardour/group_tabs.cc
index f81cc585f8fb10c7ce4b3e727202be5fcbfc7850..0728c33046bc79115d2bcea7da6bf8b7fae5d027 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) {
@@ -306,7 +306,7 @@ GroupTabs::add_new_from_items (Menu_Helpers::MenuList& items)
        using namespace Menu_Helpers;
        Menu *new_from;
 
-       new_from = new Menu;
+       new_from = manage (new Menu);
        {
                MenuList& f = new_from->items ();
                f.push_back (MenuElem (_("Selection..."), sigc::bind (sigc::mem_fun (*this, &GroupTabs::new_from_selection), false)));
@@ -315,7 +315,7 @@ GroupTabs::add_new_from_items (Menu_Helpers::MenuList& items)
        }
        items.push_back (MenuElem (_("Create New Group From..."), *new_from));
 
-       new_from = new Menu;
+       new_from = manage (new Menu);
        {
                MenuList& f = new_from->items ();
                f.push_back (MenuElem (_("Selection..."), sigc::bind (sigc::mem_fun (*this, &GroupTabs::new_from_selection), true)));
@@ -341,9 +341,6 @@ GroupTabs::get_menu (RouteGroup* g, bool in_tab_area)
        const VCAList vcas = _session->vca_manager().vcas ();
 
        if (!in_tab_area) {
-               items.push_back (MenuElem (_("Create New Group ..."), sigc::bind (sigc::mem_fun(*this, &GroupTabs::run_new_group_dialog), (RouteList const *) 0, false)));
-               items.push_back (MenuElem (_("Create New Group with Control Master ..."), sigc::bind (sigc::mem_fun(*this, &GroupTabs::run_new_group_dialog), (RouteList const *) 0, true)));
-
                /* context menu is not for a group tab, show the "create new
                   from" items here
                */
@@ -358,14 +355,14 @@ GroupTabs::get_menu (RouteGroup* g, bool in_tab_area)
 
                items.push_back (SeparatorElem());
 
-               vca_menu = new Menu;
+               vca_menu = manage (new Menu);
                MenuList& f (vca_menu->items());
                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());
@@ -392,38 +389,38 @@ GroupTabs::get_menu (RouteGroup* g, bool in_tab_area)
 
        items.push_back (SeparatorElem());
 
-       vca_menu = new Menu;
+       vca_menu = manage (new Menu);
        {
                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 (string_compose ("VCA %1", (*v)->number()), 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;
+       vca_menu = manage (new Menu);
        {
                MenuList& f (vca_menu->items());
-               f.push_back (MenuElem ("New", sigc::bind (sigc::mem_fun (*this, &GroupTabs::assign_selection_to_master), 0)));
+               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 (string_compose ("VCA %1", (*v)->number()), 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_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;
+       vca_menu = manage (new Menu);
        {
                MenuList& f (vca_menu->items());
-               f.push_back (MenuElem ("New", sigc::bind (sigc::mem_fun (*this, &GroupTabs::assign_selection_to_master), 0)));
+               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 (string_compose ("VCA %1", (*v)->number()), 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_soloed_to_master), (*v)->number())));
                }
 
        }
-       items.push_back (MenuElem (_("Assign Soloed to Control Master...")));
+       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)));
@@ -503,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);
        }
 }
 
@@ -669,6 +666,9 @@ GroupTabs::collect (RouteGroup* g)
 
        int diff = 0;
        int coll = -1;
+
+       PresentationInfo::ChangeSuspender cs;
+
        while (i != group_routes->end() && j != routes->end()) {
 
                PresentationInfo::order_t const k = (*j)->presentation_info ().order();
@@ -682,21 +682,19 @@ GroupTabs::collect (RouteGroup* g)
                                --diff;
                        }
 
-                       (*j)->set_presentation_order (coll, false);
+                       (*j)->set_presentation_order (coll);
 
                        ++coll;
                        ++i;
 
                } else {
 
-                       (*j)->set_presentation_order (k + diff, false);
+                       (*j)->set_presentation_order (k + diff);
 
                }
 
                ++j;
        }
-
-       _session->notify_presentation_info_change ();
 }
 
 void
@@ -724,7 +722,14 @@ GroupTabs::set_activation (RouteGroup* g, bool a)
 void
 GroupTabs::remove_group (RouteGroup* g)
 {
+       RouteList rl (*(g->route_list().get()));
        _session->remove_route_group (*g);
+
+       PresentationInfo::ChangeSuspender cs;
+
+       for (RouteList::iterator i = rl.begin(); i != rl.end(); ++i) {
+               (*i)->presentation_info().PropertyChanged (Properties::color);
+       }
 }
 
 /** Set the color of the tab of a route group */
@@ -860,7 +865,9 @@ GroupTabs::route_removed_from_route_group (RouteGroup*, boost::weak_ptr<Route> w
 void
 GroupTabs::emit_gui_changed_for_members (RouteGroup* rg)
 {
+       PresentationInfo::ChangeSuspender cs;
+
        for (RouteList::iterator i = rg->route_list()->begin(); i != rg->route_list()->end(); ++i) {
-               (*i)->gui_changed (X_("color"), 0);
+               (*i)->presentation_info().PropertyChanged (Properties::color);
        }
 }