X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fmute_master.cc;h=9f2ed08dab5ce5f7fd4af3000d34dec150d7708b;hb=1fd4d40dbbb426d32701f42809f4b33a5659aac4;hp=db4b6ca178a4264972241555b091e38de36ed03b;hpb=6e9b9294e1e7a22f31eabbafa39cee5844b3449a;p=ardour.git

diff --git a/libs/ardour/mute_master.cc b/libs/ardour/mute_master.cc
index db4b6ca178..9f2ed08dab 100644
--- a/libs/ardour/mute_master.cc
+++ b/libs/ardour/mute_master.cc
@@ -1,6 +1,6 @@
 /*
 
-    Copyright (C) 2009 Paul Davis 
+    Copyright (C) 2009 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -19,30 +19,40 @@
 */
 
 #include "pbd/enumwriter.h"
+#include "pbd/xml++.h"
+#include "pbd/convert.h"
 
+#include "ardour/types.h"
 #include "ardour/mute_master.h"
-#include "ardour/rc_configuration.h"
+#include "ardour/session.h"
 
 #include "i18n.h"
 
 using namespace ARDOUR;
+using namespace std;
 
-MuteMaster::MuteMaster (Session& s, const std::string& name)
-	: AutomationControl (s, Evoral::Parameter (MuteAutomation), boost::shared_ptr<AutomationList>(), name)
+MuteMaster::MuteMaster (Session& s, const std::string&)
+	: SessionHandleRef (s)
 	, _mute_point (MutePoint (0))
+        , _muted_by_self (false)
+        , _soloed (false)
+        , _solo_ignore (false)
 {
-	// 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);
 	}
 }
 
@@ -65,45 +75,68 @@ MuteMaster::unmute_at (MutePoint mp)
 }
 
 void
-MuteMaster::mute (bool yn)
+MuteMaster::set_soloed (bool yn)
 {
-	/* convenience wrapper around AutomationControl method */
-
-	if (yn) {
-		set_value ((float) 0xffff);
-	} else {
-		set_value (0.0f);
-	}
+        _soloed = yn;
 }
 
 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) {
+                        gain = 1.0;
+                } else if (muted_by_self_at (mp)) {
+                        gain = 0.0;
+                } else {
+                        if (muted_by_others_at (mp)) {
+                                gain = Config->get_solo_mute_gain ();
+                        } else {
+                                gain = 1.0;
+                        }
+                }
+        } else {
+                if (muted_by_self_at (mp)) {
+                        gain = 0.0;
+                } else if (_soloed) {
+                        gain = 1.0;
+                } else {
+                        if (muted_by_others_at (mp)) {
+                                gain = Config->get_solo_mute_gain ();
+                        } else {
+                                gain = 1.0;
+                        }
+                }
+        }
+
+        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)
+MuteMaster::set_state (const XMLNode& node, int /*version*/)
 {
 	const XMLProperty* prop;
 
@@ -111,6 +144,12 @@ MuteMaster::set_state (const XMLNode& node)
 		_mute_point = (MutePoint) string_2_enum (prop->value(), _mute_point);
 	}
 
+	if ((prop = node.property ("muted")) != 0) {
+		_muted_by_self = PBD::string_is_affirmative (prop->value());
+	} else {
+                _muted_by_self = (_mute_point != MutePoint (0));
+        }
+
 	return 0;
 }
 
@@ -119,5 +158,13 @@ MuteMaster::get_state()
 {
 	XMLNode* node = new XMLNode (X_("MuteMaster"));
 	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
+{
+	return (!_solo_ignore && _session.soloing() && (_mute_point & mp));
+}
+