X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fmute_master.cc;h=52af8c386137edf893fbe191d6235834e406ff64;hb=b23d7d9170a12cbcd788e1c2cbcf688f376752ed;hp=1d0b2dda0690b23b725e1acca08890a4e33fa899;hpb=ef92349187b61349d2d5182f49f700183901f59e;p=ardour.git

diff --git a/libs/ardour/mute_master.cc b/libs/ardour/mute_master.cc
index 1d0b2dda06..52af8c3861 100644
--- a/libs/ardour/mute_master.cc
+++ b/libs/ardour/mute_master.cc
@@ -19,35 +19,51 @@
 */
 
 #include "pbd/enumwriter.h"
+#include "pbd/xml++.h"
+#include "pbd/enum_convert.h"
 
+#include "ardour/types.h"
 #include "ardour/mute_master.h"
-#include "ardour/rc_configuration.h"
+#include "ardour/session.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
+
+namespace PBD {
+	DEFINE_ENUM_CONVERT(ARDOUR::MuteMaster::MutePoint);
+}
 
 using namespace ARDOUR;
+using namespace std;
 
-const MuteMaster::MutePoint MuteMaster::AllPoints = MutePoint (MuteMaster::PreFader|
-							       MuteMaster::PostFader|
-							       MuteMaster::Listen|
-							       MuteMaster::Main);
+const string MuteMaster::xml_node_name (X_("MuteMaster"));
 
-MuteMaster::MuteMaster (Session& s, const std::string& name)
-	: AutomationControl (s, Evoral::Parameter (MuteAutomation), boost::shared_ptr<AutomationList>(), name)
+const MuteMaster::MutePoint MuteMaster::AllPoints = MuteMaster::MutePoint(
+	PreFader|PostFader|Listen|Main);
+
+MuteMaster::MuteMaster (Session& s, Muteable& m, const std::string&)
+	: SessionHandleRef (s)
+	, _muteable (&m)
 	, _mute_point (MutePoint (0))
+        , _muted_by_self (false)
+        , _soloed_by_self (false)
+        , _soloed_by_others (false)
+	, _muted_by_masters (0)
 {
-	// default range for parameter is fine
 
-	_automation = new AutomationList (MuteAutomation);
-	set_list (boost::shared_ptr<AutomationList>(_automation));
-}
+	if (Config->get_mute_affects_pre_fader ()) {
+		_mute_point = MutePoint (_mute_point | PreFader);
+	}
 
-void
-MuteMaster::clear_mute ()
-{
-	if (_mute_point != MutePoint (0)) {
-		_mute_point = MutePoint (0);
-		MutePointChanged (); // EMIT SIGNAL
+	if (Config->get_mute_affects_post_fader ()) {
+		_mute_point = MutePoint (_mute_point | PostFader);
+	}
+
+	if (Config->get_mute_affects_control_outs ()) {
+		_mute_point = MutePoint (_mute_point | Listen);
+	}
+
+	if (Config->get_mute_affects_main_outs ()) {
+		_mute_point = MutePoint (_mute_point | Main);
 	}
 }
 
@@ -69,51 +85,68 @@ MuteMaster::unmute_at (MutePoint mp)
 	}
 }
 
-void
-MuteMaster::mute (bool yn)
-{
-	/* convenience wrapper around AutomationControl method */
-
-	if (yn) {
-		set_value ((float) 0xffff);
-	} else {
-		set_value (0.0f);
-	}
-}
-
 gain_t
 MuteMaster::mute_gain_at (MutePoint mp) const
 {
-	if (_mute_point & mp) {
-		return Config->get_solo_mute_gain ();
-	} else {
-		return 1.0;
-	}
+        gain_t gain;
+
+        if (Config->get_solo_mute_override()) {
+                if (_soloed_by_self) {
+                        gain = GAIN_COEFF_UNITY;
+                } else if (muted_by_self_at (mp) || muted_by_masters_at (mp)) {
+                        gain = GAIN_COEFF_ZERO;
+                } else {
+	                if (!_soloed_by_others && muted_by_others_soloing_at (mp)) {
+                                gain = Config->get_solo_mute_gain ();
+                        } else {
+                                gain = GAIN_COEFF_UNITY;
+                        }
+                }
+        } else {
+	        if (muted_by_self_at (mp) || muted_by_masters_at (mp)) {
+                        gain = GAIN_COEFF_ZERO;
+                } else if (_soloed_by_self || _soloed_by_others) {
+                        gain = GAIN_COEFF_UNITY;
+                } else {
+                        if (muted_by_others_soloing_at (mp)) {
+                                gain = Config->get_solo_mute_gain ();
+                        } else {
+                                gain = GAIN_COEFF_UNITY;
+                        }
+                }
+        }
+
+        return gain;
 }
 
 void
-MuteMaster::set_value (float f)
+MuteMaster::set_mute_points (const std::string& mute_point)
 {
-	MutePoint old = _mute_point;
-	_mute_point = (MutePoint) (rint (f));
-	if (old != _mute_point) {
-		MutePointChanged (); // EMIT SIGNAL
-	}
+        MutePoint old = _mute_point;
+
+	_mute_point = (MutePoint) string_2_enum (mute_point, _mute_point);
+
+        if (old != _mute_point) {
+                MutePointChanged(); /* EMIT SIGNAL */
+        }
 }
 
-float
-MuteMaster::get_value () const
+void
+MuteMaster::set_mute_points (MutePoint mp)
 {
-	return (float) _mute_point;
+        if (_mute_point != mp) {
+                _mute_point = mp;
+                MutePointChanged (); /* EMIT SIGNAL */
+        }
 }
 
 int
 MuteMaster::set_state (const XMLNode& node, int /*version*/)
 {
-	const XMLProperty* prop;
+	node.get_property ("mute-point", _mute_point);
 
-	if ((prop = node.property ("mute-point")) != 0) {
-		_mute_point = (MutePoint) string_2_enum (prop->value(), _mute_point);
+	if (!node.get_property ("muted", _muted_by_self)) {
+		_muted_by_self = (_mute_point != MutePoint (0));
 	}
 
 	return 0;
@@ -122,7 +155,20 @@ MuteMaster::set_state (const XMLNode& node, int /*version*/)
 XMLNode&
 MuteMaster::get_state()
 {
-	XMLNode* node = new XMLNode (X_("MuteMaster"));
-	node->add_property ("mute-point", enum_2_string (_mute_point));
+	XMLNode* node = new XMLNode (xml_node_name);
+	node->set_property ("mute-point", _mute_point);
+	node->set_property ("muted", _muted_by_self);
 	return *node;
 }
+
+bool
+MuteMaster::muted_by_others_soloing_at (MutePoint mp) const
+{
+	return _muteable->muted_by_others_soloing() && (_mute_point & mp);
+}
+
+void
+MuteMaster::set_muted_by_masters (bool yn)
+{
+	_muted_by_masters = yn;
+}