diff options
| author | Robin Gareus <robin@gareus.org> | 2015-10-06 14:14:44 +0200 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2015-10-06 14:14:44 +0200 |
| commit | b1609b53bd38508068a847a0e05ac0fc7100bbc8 (patch) | |
| tree | e79f13c63ac27a995adeb7a7dea2b85a11988175 | |
| parent | 139cb23ab98abc2d166b74ea025719d1730dc203 (diff) | |
more solo propagation fixes.
handle cases Track(s) -> Bus1 -> Bus2
| -rw-r--r-- | libs/ardour/route.cc | 5 | ||||
| -rw-r--r-- | libs/ardour/session.cc | 11 |
2 files changed, 9 insertions, 7 deletions
diff --git a/libs/ardour/route.cc b/libs/ardour/route.cc index a5c1af0e87..5393bcc682 100644 --- a/libs/ardour/route.cc +++ b/libs/ardour/route.cc @@ -900,8 +900,11 @@ Route::mod_solo_by_others_upstream (int32_t delta) (old_sbu > 0 && _soloed_by_others_upstream == 0))) { if (delta > 0 || !Config->get_exclusive_solo()) { - DEBUG_TRACE (DEBUG::Solo, "\t ... INVERT push\n"); + DEBUG_TRACE (DEBUG::Solo, string_compose("\t ... INVERT push from %1\n", _name)); for (FedBy::iterator i = _fed_by.begin(); i != _fed_by.end(); ++i) { + if (i->sends_only) { + continue; + } boost::shared_ptr<Route> sr = i->r.lock(); if (sr) { sr->mod_solo_by_others_downstream (-delta); diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc index 12d53f3373..9d0c4f9662 100644 --- a/libs/ardour/session.cc +++ b/libs/ardour/session.cc @@ -3614,6 +3614,8 @@ Session::route_solo_changed (bool self_solo_change, void* /*src*/, boost::weak_p if (!via_sends_only) { if (!route->soloed_by_others_upstream()) { (*i)->mod_solo_by_others_downstream (delta); + } else { + DEBUG_TRACE (DEBUG::Solo, "\talready soloed by others upstream\n"); } } else { DEBUG_TRACE (DEBUG::Solo, string_compose ("\tthere is a send-only feed from %1\n", (*i)->name())); @@ -3638,12 +3640,9 @@ Session::route_solo_changed (bool self_solo_change, void* /*src*/, boost::weak_p route->soloed_by_others_downstream(), route->soloed_by_others_upstream())); if (!via_sends_only) { - if (!route->soloed_by_others_downstream()) { - DEBUG_TRACE (DEBUG::Solo, string_compose ("\tmod %1 by %2\n", (*i)->name(), delta)); - (*i)->mod_solo_by_others_upstream (delta); - } else { - DEBUG_TRACE (DEBUG::Solo, "\talready soloed by others downstream\n"); - } + //NB. Triggers Invert Push, which handles soloed by downstream + DEBUG_TRACE (DEBUG::Solo, string_compose ("\tmod %1 by %2\n", (*i)->name(), delta)); + (*i)->mod_solo_by_others_upstream (delta); } else { DEBUG_TRACE (DEBUG::Solo, string_compose ("\tfeed to %1 ignored, sends-only\n", (*i)->name())); } |