#include "pbd/enumwriter.h"
#include "pbd/xml++.h"
-#include "pbd/convert.h"
+#include "pbd/enum_convert.h"
#include "ardour/types.h"
#include "ardour/mute_master.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 = MuteMaster::MutePoint(
PreFader|PostFader|Listen|Main);
-MuteMaster::MuteMaster (Session& s, const std::string&)
+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)
- , _solo_ignore (false)
- , _muted_by_others (0)
+ , _muted_by_masters (0)
{
if (Config->get_mute_affects_pre_fader ()) {
if (Config->get_solo_mute_override()) {
if (_soloed_by_self) {
gain = GAIN_COEFF_UNITY;
- } else if (muted_by_self_at (mp)) {
+ } else if (muted_by_self_at (mp) || muted_by_masters_at (mp)) {
gain = GAIN_COEFF_ZERO;
} else {
- if (muted_by_others_at (mp) && !_soloed_by_others) {
+ 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)) {
+ 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 = GAIN_COEFF_UNITY;
int
MuteMaster::set_state (const XMLNode& node, int /*version*/)
{
- XMLProperty const * 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));
}
- 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;
}
MuteMaster::get_state()
{
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")));
+ node->set_property ("mute-point", _mute_point);
+ node->set_property ("muted", _muted_by_self);
return *node;
}
bool
-MuteMaster::muted_by_others_at (MutePoint mp) const
+MuteMaster::muted_by_others_soloing_at (MutePoint mp) const
{
- return (!_solo_ignore && (_muted_by_others || _session.soloing()) && (_mute_point & mp));
+ return _muteable->muted_by_others_soloing() && (_mute_point & mp);
}
void
-MuteMaster::mod_muted_by_others (int32_t delta)
+MuteMaster::set_muted_by_masters (bool yn)
{
- _muted_by_others = max (0, _muted_by_others + delta);
+ _muted_by_masters = yn;
}