X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fmute_master.cc;h=9cc424b84d743fe8b1d7a6b90a1b68c97dd8c106;hb=63b6ab1101bf3e3f67226fa82c8fb11ea2f832e0;hp=0182e205d03588d5c742d8e6c6b86d70af6adfab;hpb=6dac4da98344ed8ce609a4e7d567ef2f9fbb9b31;p=ardour.git

diff --git a/libs/ardour/mute_master.cc b/libs/ardour/mute_master.cc
index 0182e205d0..9cc424b84d 100644
--- a/libs/ardour/mute_master.cc
+++ b/libs/ardour/mute_master.cc
@@ -1,5 +1,4 @@
 /*
-
     Copyright (C) 2009 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
@@ -20,26 +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 "pbd/i18n.h"
 
-#include "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&, const std::string&)
-	: _mute_point (AllPoints)
-        , _self_muted (false)
-        , _muted_by_others (0)
+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)
 {
+
+	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
@@ -47,7 +71,6 @@ MuteMaster::mute_at (MutePoint mp)
 {
 	if ((_mute_point & mp) != mp) {
 		_mute_point = MutePoint (_mute_point | mp);
-                cerr << "Mute point set, now " << _mute_point << endl;
 		MutePointChanged (); // EMIT SIGNAL
 	}
 }
@@ -57,132 +80,94 @@ MuteMaster::unmute_at (MutePoint mp)
 {
 	if ((_mute_point & mp) == mp) {
 		_mute_point = MutePoint (_mute_point & ~mp);
-                cerr << "Mute point unset, now " << _mute_point << endl;
 		MutePointChanged (); // EMIT SIGNAL
 	}
 }
 
-void
-MuteMaster::clear_muted_by_others ()
+gain_t
+MuteMaster::mute_gain_at (MutePoint mp) const
 {
-        _muted_by_others = 0;
-}
+	gain_t gain;
 
-void
-MuteMaster::mod_muted_by_others (int32_t delta)
-{
-	if (delta < 0) {
-		if (_muted_by_others >= (uint32_t) abs (delta)) {
-			_muted_by_others += delta;
+	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 {
-			_muted_by_others = 0;
+			if (!_soloed_by_others && muted_by_others_soloing_at (mp)) {
+				gain = Config->get_solo_mute_gain ();
+			} else {
+				gain = GAIN_COEFF_UNITY;
+			}
 		}
 	} else {
-		_muted_by_others += delta;
+		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;
+			}
+		}
 	}
-}
-
-void
-MuteMaster::set_solo_level (int32_t l)
-{
-        _solo_level = l;
-}
 
-gain_t
-MuteMaster::mute_gain_at (MutePoint mp) const
-{
-        gain_t gain;
-        int32_t l = _solo_level;
-
-        if (Config->get_solo_mute_override()) {
-                if (l == 2) { // self-soloed
-                        gain = 1.0;
-                } else if (self_muted_at (mp)) { // self-muted 
-                        gain = Config->get_solo_mute_gain ();
-                } else if (l == 1) { // soloed by others
-                        gain = 1.0;
-                } else if (muted_by_others_at (mp)) { // muted by others
-                        gain = Config->get_solo_mute_gain ();
-                } else {
-                        gain = 1.0;
-                }
-        } else {
-                if (self_muted_at (mp)) { // self-muted 
-                        gain = Config->get_solo_mute_gain ();
-                } else if (l == 2) { // self-soloed
-                        gain = 1.0;
-                } else if (muted_by_others_at (mp)) { // muted by others
-                        gain = Config->get_solo_mute_gain ();
-                } else if (l == 1) { // soloed by others
-                        gain = 1.0;
-                } else {
-                        gain = 1.0;
-                }
-        }
-
-        return gain;
+	return gain;
 }
 
 void
 MuteMaster::set_mute_points (const std::string& mute_point)
 {
-        MutePoint old = _mute_point;
+	MutePoint old = _mute_point;
 
 	_mute_point = (MutePoint) string_2_enum (mute_point, _mute_point);
-        cerr << "Mute point set from string, now " << _mute_point << endl;
 
-        if (old != _mute_point) {
-                MutePointChanged(); /* EMIT SIGNAL */
-        }
+	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;
-                cerr << "Mute point set from mp, now " << _mute_point << endl;
-                MutePointChanged (); /* EMIT SIGNAL */
-        }
+	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);
-                cerr << "Mute point set from STATE string, now " << _mute_point << endl;
+	if (!node.get_property ("muted", _muted_by_self)) {
+		_muted_by_self = (_mute_point != MutePoint (0));
 	}
 
-	if ((prop = node.property ("muted")) != 0) {
-		_self_muted = string_is_affirmative (prop->value());
-	} else {
-                _self_muted = (_mute_point != MutePoint (0));
-        }
-
-        if ((prop = node.property ("muted-by-others")) != 0) {
-                if (sscanf (prop->value().c_str(), "%u", &_muted_by_others) != 1) {
-                        _muted_by_others = 0;
-                }
-        } else {
-                _muted_by_others = 0;
-        }
-
 	return 0;
 }
 
 XMLNode&
 MuteMaster::get_state()
 {
-	XMLNode* node = new XMLNode (X_("MuteMaster"));
-	node->add_property ("mute-point", enum_2_string (_mute_point));
-	node->add_property ("muted", (_self_muted ? X_("yes") : X_("no")));
+	XMLNode* node = new XMLNode (xml_node_name);
+	node->set_property ("mute-point", _mute_point);
+	node->set_property ("muted", _muted_by_self);
+	return *node;
+}
 
-        char buf[32];
-        snprintf (buf, sizeof (buf), "%u", _muted_by_others);
-	node->add_property ("muted-by-others", buf);
+bool
+MuteMaster::muted_by_others_soloing_at (MutePoint mp) const
+{
+	return _muteable->muted_by_others_soloing() && (_mute_point & mp);
+}
 
-	return *node;
+void
+MuteMaster::set_muted_by_masters (bool yn)
+{
+	_muted_by_masters = yn;
 }