X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=inline;f=libs%2Fardour%2Fmute_master.cc;h=32f50bd573ffed4e33f8e117e130c0c00f575cad;hb=7eb2d1d16de5d52175485bdd1a6acc53019fdb22;hp=a58bb8a421d11edced397bd4e62c97b49d1564c1;hpb=a473d630eb165272992e90f8d854b1d66ec0be63;p=ardour.git

diff --git a/libs/ardour/mute_master.cc b/libs/ardour/mute_master.cc
index a58bb8a421..32f50bd573 100644
--- a/libs/ardour/mute_master.cc
+++ b/libs/ardour/mute_master.cc
@@ -20,6 +20,7 @@
 
 #include "pbd/enumwriter.h"
 #include "pbd/xml++.h"
+#include "pbd/convert.h"
 
 #include "ardour/types.h"
 #include "ardour/mute_master.h"
@@ -30,12 +31,19 @@
 using namespace ARDOUR;
 using namespace std;
 
+const string MuteMaster::xml_node_name (X_("MuteMaster"));
+
+const MuteMaster::MutePoint MuteMaster::AllPoints = MuteMaster::MutePoint(
+	PreFader|PostFader|Listen|Main);
+
 MuteMaster::MuteMaster (Session& s, const std::string&)
 	: SessionHandleRef (s)
 	, _mute_point (MutePoint (0))
         , _muted_by_self (false)
-        , _soloed (false)
+        , _soloed_by_self (false)
+        , _soloed_by_others (false)
         , _solo_ignore (false)
+	, _muted_by_masters (0)
 {
 
 	if (Config->get_mute_affects_pre_fader ()) {
@@ -73,39 +81,33 @@ MuteMaster::unmute_at (MutePoint mp)
 	}
 }
 
-void
-MuteMaster::set_soloed (bool yn)
-{
-        _soloed = yn;
-}
-
 gain_t
 MuteMaster::mute_gain_at (MutePoint mp) const
 {
         gain_t gain;
 
         if (Config->get_solo_mute_override()) {
-                if (_soloed) {
-                        gain = 1.0;
-                } else if (muted_by_self_at (mp)) {
-                        gain = 0.0;
+                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 (muted_by_others_at (mp)) {
+	                if (!_soloed_by_others && muted_by_others_soloing_at (mp)) {
                                 gain = Config->get_solo_mute_gain ();
                         } else {
-                                gain = 1.0;
+                                gain = GAIN_COEFF_UNITY;
                         }
                 }
         } else {
-                if (muted_by_self_at (mp)) {
-                        gain = 0.0;
-                } else if (_soloed) {
-                        gain = 1.0;
+	        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_at (mp)) {
+                        if (muted_by_others_soloing_at (mp)) {
                                 gain = Config->get_solo_mute_gain ();
                         } else {
-                                gain = 1.0;
+                                gain = GAIN_COEFF_UNITY;
                         }
                 }
         }
@@ -137,14 +139,14 @@ MuteMaster::set_mute_points (MutePoint mp)
 int
 MuteMaster::set_state (const XMLNode& node, int /*version*/)
 {
-	const XMLProperty* prop;
+	XMLProperty const * prop;
 
 	if ((prop = node.property ("mute-point")) != 0) {
 		_mute_point = (MutePoint) string_2_enum (prop->value(), _mute_point);
 	}
 
 	if ((prop = node.property ("muted")) != 0) {
-		_muted_by_self = string_is_affirmative (prop->value());
+		_muted_by_self = PBD::string_is_affirmative (prop->value());
 	} else {
                 _muted_by_self = (_mute_point != MutePoint (0));
         }
@@ -155,15 +157,23 @@ MuteMaster::set_state (const XMLNode& node, int /*version*/)
 XMLNode&
 MuteMaster::get_state()
 {
-	XMLNode* node = new XMLNode (X_("MuteMaster"));
+	XMLNode* node = new XMLNode (xml_node_name);
 	node->add_property ("mute-point", enum_2_string (_mute_point));
 	node->add_property ("muted", (_muted_by_self ? X_("yes") : X_("no")));
 	return *node;
 }
 
 bool
-MuteMaster::muted_by_others_at (MutePoint mp) const
+MuteMaster::muted_by_others_soloing_at (MutePoint mp) const
 {
-	return (!_solo_ignore && _session.soloing() && (_mute_point & mp));
+	/* note: this is currently called with the assumption that the owner is
+	   not soloed. it does not test for this condition.
+	*/
+	return (!_solo_ignore && _session.soloing()) && (_mute_point & mp);
 }
 
+void
+MuteMaster::set_muted_by_masters (bool yn)
+{
+	_muted_by_masters = yn;
+}