summaryrefslogtreecommitdiff
path: root/libs/ardour/delivery.cc
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2010-04-19 14:02:53 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2010-04-19 14:02:53 +0000
commit1ceee92bb57744259afca833abbd07a2013567ee (patch)
treea80b7537e23524a6b411463660e4ed3ec1c38615 /libs/ardour/delivery.cc
parent0cde999d87ea4623d118f562e58305c7a97da8b8 (diff)
permanently mark Delivery processors on master/monitor/audition as immune to solo effects, rather than having to reset them every time something else is soloed
git-svn-id: svn://localhost/ardour2/branches/3.0@6936 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/delivery.cc')
-rw-r--r--libs/ardour/delivery.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/libs/ardour/delivery.cc b/libs/ardour/delivery.cc
index 50ca18cb6d..3607836f3c 100644
--- a/libs/ardour/delivery.cc
+++ b/libs/ardour/delivery.cc
@@ -57,6 +57,7 @@ Delivery::Delivery (Session& s, boost::shared_ptr<IO> io, boost::shared_ptr<Mute
, _no_outs_cuz_we_no_monitor (false)
, _solo_level (0)
, _solo_isolated (false)
+ , _solo_ignored (false)
, _mute_master (mm)
, no_panner_reset (false)
{
@@ -81,6 +82,7 @@ Delivery::Delivery (Session& s, boost::shared_ptr<MuteMaster> mm, const string&
, _no_outs_cuz_we_no_monitor (false)
, _solo_level (0)
, _solo_isolated (false)
+ , _solo_ignored (false)
, _mute_master (mm)
, no_panner_reset (false)
{
@@ -486,7 +488,7 @@ Delivery::target_gain ()
gain_t desired_gain = -1.0f;
- if (_solo_level) {
+ if (_solo_level || _solo_ignored) {
desired_gain = 1.0;