diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2016-01-21 12:04:20 -0500 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2016-01-22 11:58:31 -0500 |
| commit | 23794eca5b4c352709e9054a9f32cab01228af25 (patch) | |
| tree | 80c4e6fd563726cfe9cadbb672d81e6476a33858 /libs/ardour | |
| parent | 9e5b7db89f381c70232fab35dc21fd885863f998 (diff) | |
rename Controllable::WholeGroup => InverseGroup to reflect real intent.
Add logic to RouteGroupMember::use_group() to implement the real intent of InverseGroup
Diffstat (limited to 'libs/ardour')
| -rw-r--r-- | libs/ardour/route_group_member.cc | 7 | ||||
| -rw-r--r-- | libs/ardour/session.cc | 2 |
2 files changed, 5 insertions, 4 deletions
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))); } diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc index 70a62e5b75..6c25270421 100644 --- a/libs/ardour/session.cc +++ b/libs/ardour/session.cc @@ -3673,7 +3673,7 @@ Session::route_solo_changed (bool self_solo_change, Controllable::GroupControlDi * The first argument to the signal that this method is connected to is the * GroupControlDisposition value that was used to change solo. * - * If the solo change was done with group semantics (either WholeGroup + * If the solo change was done with group semantics (either InverseGroup * (force the entire group to change even if the group shared solo is * disabled) or UseGroup (use the group, which may or may not have the * shared solo property enabled)) then as we propagate the change to |