diff options
| author | Carl Hetherington <carl@carlh.net> | 2010-05-17 23:28:13 +0000 |
|---|---|---|
| committer | Carl Hetherington <carl@carlh.net> | 2010-05-17 23:28:13 +0000 |
| commit | f35dc8b35da3dc11cbb1076193657f8335722041 (patch) | |
| tree | c816fe23d59070e08821dc5e577b6e750af07bb1 /libs/ardour/delivery.cc | |
| parent | 6d9c1201cc6c9adf866fb7769037c79decf2e5b0 (diff) | |
Remove muting behaviour from the Amp processor. Fix some small
bugs with delivery muting. The upshot being that muting now definitely
happens in a channel's deliveries, and not really in the channel strip
at all. When the channel is muted, those deliveries described by
the MuteMaster settings are muted. Should fix #3141.
git-svn-id: svn://localhost/ardour2/branches/3.0@7115 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/delivery.cc')
| -rw-r--r-- | libs/ardour/delivery.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/libs/ardour/delivery.cc b/libs/ardour/delivery.cc index 5861e5ea2c..7fa6138ab5 100644 --- a/libs/ardour/delivery.cc +++ b/libs/ardour/delivery.cc @@ -495,12 +495,14 @@ Delivery::target_gain () case Send: case Insert: case Aux: - /* XXX FIX ME this is wrong, we need per-delivery muting */ - mp = MuteMaster::PreFader; + if (_pre_fader) { + mp = MuteMaster::PreFader; + } else { + mp = MuteMaster::PostFader; + } break; } - // cerr << name() << ' '; desired_gain = _mute_master->mute_gain_at (mp); if (_role == Listen && _session.monitor_out() && !_session.listening()) { |