X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fmute_master.cc;h=ed77942f6c4ae03070930dc3b93e0630670ed05b;hb=cf8cc1944928132c99e382918b3c7c03b2298b80;hp=9a95e70a115ee83cd082126940ca79dab1d5839f;hpb=6ad69a206ca325e9e50eff4f8f2088170b468f00;p=ardour.git

diff --git a/libs/ardour/mute_master.cc b/libs/ardour/mute_master.cc
index 9a95e70a11..ed77942f6c 100644
--- a/libs/ardour/mute_master.cc
+++ b/libs/ardour/mute_master.cc
@@ -20,28 +20,47 @@
 
 #include "pbd/enumwriter.h"
 #include "pbd/xml++.h"
+#include "pbd/convert.h"
 
 #include "ardour/types.h"
 #include "ardour/mute_master.h"
 #include "ardour/session.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 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&)
-	: SessionHandleRef (s) 
-        , _mute_point (AllPoints)
+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 (false)
-        , _solo_ignore (false)
+        , _soloed_by_self (false)
+        , _soloed_by_others (false)
+	, _muted_by_masters (0)
 {
+
+	if (Config->get_mute_affects_pre_fader ()) {
+		_mute_point = MutePoint (_mute_point | PreFader);
+	}
+
+	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);
+	}
 }
 
 void
@@ -62,43 +81,37 @@ 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 = Config->get_solo_mute_gain ();
+                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)) {
-                                gain = 0.0;
+	                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 = Config->get_solo_mute_gain ();
-                } 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)) {
-                                gain = 0.0;
+                        if (muted_by_others_soloing_at (mp)) {
+                                gain = Config->get_solo_mute_gain ();
                         } else {
-                                gain = 1.0;
+                                gain = GAIN_COEFF_UNITY;
                         }
                 }
         }
-        
+
         return gain;
 }
 
@@ -108,14 +121,14 @@ MuteMaster::set_mute_points (const std::string& mute_point)
         MutePoint old = _mute_point;
 
 	_mute_point = (MutePoint) string_2_enum (mute_point, _mute_point);
-        
+
         if (old != _mute_point) {
                 MutePointChanged(); /* EMIT SIGNAL */
         }
 }
 
 void
-MuteMaster::set_mute_points (MutePoint mp) 
+MuteMaster::set_mute_points (MutePoint mp)
 {
         if (_mute_point != mp) {
                 _mute_point = mp;
@@ -126,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));
         }
@@ -144,15 +157,20 @@ 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 _muteable->muted_by_others_soloing() && (_mute_point & mp);
+}
+
+void
+MuteMaster::set_muted_by_masters (bool yn)
 {
-	return (!_solo_ignore && _session.soloing() && (_mute_point & mp));
+	_muted_by_masters = yn;
 }
-