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

1 files changed, 1 insertions, 3 deletions

diff --git a/libs/ardour/ardour/amp.h b/libs/ardour/ardour/amp.h
index 4db2292653..c1f6172de1 100644
--- a/libs/ardour/ardour/amp.h
+++ b/libs/ardour/ardour/amp.h
@@ -28,14 +28,13 @@ namespace ARDOUR {
 
 class BufferSet;
 class IO;
-class MuteMaster;
 
 /** Applies a declick operation to all audio inputs, passing the same number of
  * audio outputs, and passing through any other types unchanged.
  */
 class Amp : public Processor {
 public:
-	Amp(Session& s, boost::shared_ptr<MuteMaster> m);
+	Amp(Session& s);
 
 	std::string display_name() const;
 
@@ -101,7 +100,6 @@ private:
 	float  _current_gain;
 
 	boost::shared_ptr<GainControl> _gain_control;
-	boost::shared_ptr<MuteMaster>  _mute_master;
 };