X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Fmute_master.h;h=460c7bf48ba6e65ac688b6fafdd0aff4d3c4ed3b;hb=da9b82732eed632d8b940818382f7eb369100964;hp=ef65e69aba6b70b4c088c12203513c8864dd6175;hpb=ef92349187b61349d2d5182f49f700183901f59e;p=ardour.git

diff --git a/libs/ardour/ardour/mute_master.h b/libs/ardour/ardour/mute_master.h
index ef65e69aba..460c7bf48b 100644
--- a/libs/ardour/ardour/mute_master.h
+++ b/libs/ardour/ardour/mute_master.h
@@ -21,21 +21,25 @@
 #define __ardour_mute_master_h__
 
 #include "evoral/Parameter.hpp"
-#include "ardour/automation_control.h"
-#include "ardour/automation_list.h"
+#include "pbd/signals.h"
+#include "pbd/stateful.h"
+#include <string>
+
+#include "ardour/session_handle.h"
 
 namespace ARDOUR {
 
 class Session;
 
-class MuteMaster : public AutomationControl
+class MuteMaster : public SessionHandleRef, public PBD::Stateful
 {
   public:
+	/** deliveries to mute when the channel is "muted" */
 	enum MutePoint {
-		PreFader  = 0x1,
-		PostFader = 0x2,
-		Listen    = 0x4,
-		Main      = 0x8
+		PreFader  = 0x1, ///< mute all pre-fader sends
+		PostFader = 0x2, ///< mute all post-fader sends
+		Listen    = 0x4, ///< mute listen out
+		Main      = 0x8  ///< mute main out
 	};
 
 	static const MutePoint AllPoints;
@@ -43,35 +47,34 @@ class MuteMaster : public AutomationControl
 	MuteMaster (Session& s, const std::string& name);
 	~MuteMaster() {}
 
-	bool muted_pre_fader() const  { return _mute_point & PreFader; }
-	bool muted_post_fader() const { return _mute_point & PostFader; }
-	bool muted_listen() const     { return _mute_point & Listen; }
-	bool muted_main () const      { return _mute_point & Main; }
-
-	bool muted_at (MutePoint mp) const { return _mute_point & mp; }
-	bool muted() const { return _mute_point != MutePoint (0); }
+	bool muted_by_self () const { return _muted_by_self && (_mute_point != MutePoint (0)); }
+	bool muted_by_self_at (MutePoint mp) const { return _muted_by_self && (_mute_point & mp); }
+	bool muted_by_others_at (MutePoint mp) const;
 
 	gain_t mute_gain_at (MutePoint) const;
 
-	void clear_mute ();
+	void set_muted_by_self (bool yn) { _muted_by_self = yn; }
+
 	void mute_at (MutePoint);
 	void unmute_at (MutePoint);
 
-	void mute (bool yn);
-
-	/* Controllable interface */
+	void set_mute_points (const std::string& mute_point);
+	void set_mute_points (MutePoint);
+	MutePoint mute_points() const { return _mute_point; }
 
-	void set_value (float); /* note: float is used as a bitfield of MutePoints */
-	float get_value () const;
+	void set_soloed (bool);
+	void set_solo_ignore (bool yn) { _solo_ignore = yn; }
 
-	sigc::signal<void> MutePointChanged;
+	PBD::Signal0<void> MutePointChanged;
 
 	XMLNode& get_state();
 	int set_state(const XMLNode&, int version);
 
   private:
-	AutomationList* _automation;
-	MutePoint _mute_point;
+	volatile MutePoint _mute_point;
+	volatile bool      _muted_by_self;
+	volatile bool      _soloed;
+	volatile bool      _solo_ignore;
 };
 
 } // namespace ARDOUR