From: Robin Gareus <robin@gareus.org>
Date: Tue, 6 Oct 2015 10:03:20 +0000 (+0200)
Subject: "Solo Lock" only locks explicit solo (not implicit).
X-Git-Tag: 4.3~92
X-Git-Url: https://main.carlh.net/gitweb/?p=ardour.git;a=commitdiff_plain;h=fb2e8387ddfcaaeb19b238b0b3aef2b75c4a5d78

"Solo Lock" only locks explicit solo (not implicit).

fixes issue:

Track -> Bus
1) solo track -> implicit Bus solo
2) Solo-Lock Bus
3) un-solo track -> Bus is stuck w/implicit solo on
---

diff --git a/libs/ardour/route.cc b/libs/ardour/route.cc
index eaf7dfa31b..d9ead37c9a 100644
--- a/libs/ardour/route.cc
+++ b/libs/ardour/route.cc
@@ -862,11 +862,6 @@ Route::set_self_solo (bool yn)
 void
 Route::mod_solo_by_others_upstream (int32_t delta)
 {
-	if (_solo_safe) {
-		DEBUG_TRACE (DEBUG::Solo, string_compose ("%1 ignore solo-by-upstream due to solo-safe\n", name()));
-		return;
-	}
-
 	DEBUG_TRACE (DEBUG::Solo, string_compose ("%1 mod solo-by-upstream by %2, current up = %3 down = %4\n",
 						  name(), delta, _soloed_by_others_upstream, _soloed_by_others_downstream));
 
@@ -922,11 +917,6 @@ Route::mod_solo_by_others_upstream (int32_t delta)
 void
 Route::mod_solo_by_others_downstream (int32_t delta)
 {
-	if (_solo_safe) {
-		DEBUG_TRACE (DEBUG::Solo, string_compose ("%1 ignore solo-by-downstream due to solo safe\n", name()));
-		return;
-	}
-
 	DEBUG_TRACE (DEBUG::Solo, string_compose ("%1 mod solo-by-downstream by %2, current up = %3 down = %4\n",
 						  name(), delta, _soloed_by_others_upstream, _soloed_by_others_downstream));