From 23794eca5b4c352709e9054a9f32cab01228af25 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Thu, 21 Jan 2016 12:04:20 -0500 Subject: rename Controllable::WholeGroup => InverseGroup to reflect real intent. Add logic to RouteGroupMember::use_group() to implement the real intent of InverseGroup --- libs/ardour/route_group_member.cc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'libs/ardour/route_group_member.cc') diff --git a/libs/ardour/route_group_member.cc b/libs/ardour/route_group_member.cc index 6ab2ade21e..d0701f57da 100644 --- a/libs/ardour/route_group_member.cc +++ b/libs/ardour/route_group_member.cc @@ -40,7 +40,8 @@ bool RouteGroupMember::use_group (PBD::Controllable::GroupControlDisposition gcd, bool (RouteGroup::*predicate)(void) const) const { return (gcd != PBD::Controllable::NoGroup) && - (_route_group && - ((gcd == PBD::Controllable::WholeGroup) || - (_route_group->is_active() && (_route_group->*predicate)()))); + _route_group && + (_route_group->*predicate)() && + (((_route_group->is_active()) && (gcd != PBD::Controllable::InverseGroup)) || + ((!_route_group->is_active()) && (gcd == PBD::Controllable::InverseGroup))); } -- cgit v1.2.3