From f35dc8b35da3dc11cbb1076193657f8335722041 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 17 May 2010 23:28:13 +0000 Subject: 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 --- libs/ardour/return.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'libs/ardour/return.cc') 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())); + _amp.reset (new Amp (_session)); _meter.reset (new PeakMeter (_session)); } -- cgit v1.2.3