From 52167705ef9e3bd65c52a99d0837d5325049ff44 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Thu, 3 Jan 2013 19:34:07 +0000 Subject: expose operation to remove subgroup git-svn-id: svn://localhost/ardour2/branches/3.0@13762 d708f5d6-7413-0410-9779-e7cbd77b26cf --- gtk2_ardour/group_tabs.cc | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'gtk2_ardour/group_tabs.cc') diff --git a/gtk2_ardour/group_tabs.cc b/gtk2_ardour/group_tabs.cc index d53b905846..1332d4ba10 100644 --- a/gtk2_ardour/group_tabs.cc +++ b/gtk2_ardour/group_tabs.cc @@ -319,7 +319,11 @@ GroupTabs::get_menu (RouteGroup* g) items.push_back (MenuElem (_("Collect Group"), sigc::bind (sigc::mem_fun (*this, &GroupTabs::collect), g))); items.push_back (MenuElem (_("Remove Group"), sigc::bind (sigc::mem_fun (*this, &GroupTabs::remove_group), g))); items.push_back (SeparatorElem()); - items.push_back (MenuElem (_("Add New Subgroup Bus"), sigc::bind (sigc::mem_fun (*this, &GroupTabs::subgroup), g, false, PreFader))); + if (g->has_subgroup()) { + items.push_back (MenuElem (_("Remove Subgroup Bus"), sigc::bind (sigc::mem_fun (*this, &GroupTabs::un_subgroup), g))); + } else { + items.push_back (MenuElem (_("Add New Subgroup Bus"), sigc::bind (sigc::mem_fun (*this, &GroupTabs::subgroup), g, false, PreFader))); + } items.push_back (MenuElem (_("Add New Aux Bus (pre-fader)"), sigc::bind (sigc::mem_fun (*this, &GroupTabs::subgroup), g, true, PreFader))); items.push_back (MenuElem (_("Add New Aux Bus (post-fader)"), sigc::bind (sigc::mem_fun (*this, &GroupTabs::subgroup), g, true, PostFader))); } @@ -434,6 +438,12 @@ GroupTabs::subgroup (RouteGroup* g, bool aux, Placement placement) g->make_subgroup (aux, placement); } +void +GroupTabs::un_subgroup (RouteGroup* g) +{ + g->destroy_subgroup (); +} + struct CollectSorter { CollectSorter (RouteSortOrderKey key) : _key (key) {} -- cgit v1.2.3