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/return.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/return.cc')
| -rw-r--r-- | libs/ardour/return.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libs/ardour/return.cc b/libs/ardour/return.cc index f61dda5dd1..10879d7722 100644 --- a/libs/ardour/return.cc +++ b/libs/ardour/return.cc @@ -30,6 +30,7 @@ #include "ardour/port.h" #include "ardour/return.h" #include "ardour/session.h" +#include "ardour/mute_master.h" #include "i18n.h" @@ -43,7 +44,7 @@ Return::Return (Session& s, bool internal) { /* never muted */ - _amp.reset (new Amp (_session, boost::shared_ptr<MuteMaster>())); + _amp.reset (new Amp (_session)); _meter.reset (new PeakMeter (_session)); } |