X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fmute_master.cc;h=9f2ed08dab5ce5f7fd4af3000d34dec150d7708b;hb=d89573f8e73ee7f0c28a6b9a8b8ba0f8e78c69aa;hp=5e49a11875ad7fbd4b7f742d21fa42841f98bb3d;hpb=e33d4553b2b333c30835b00741fc5c1fd0e2b36d;p=ardour.git diff --git a/libs/ardour/mute_master.cc b/libs/ardour/mute_master.cc index 5e49a11875..9f2ed08dab 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,18 +31,29 @@ using namespace ARDOUR; using namespace std; -const MuteMaster::MutePoint MuteMaster::AllPoints = MutePoint (MuteMaster::PreFader| - MuteMaster::PostFader| - MuteMaster::Listen| - MuteMaster::Main); - MuteMaster::MuteMaster (Session& s, const std::string&) - : SessionHandleRef (s) - , _mute_point (AllPoints) - , _self_muted (false) - , _muted_by_others (0) + : SessionHandleRef (s) + , _mute_point (MutePoint (0)) + , _muted_by_self (false) + , _soloed (false) , _solo_ignore (false) { + + 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 @@ -49,7 +61,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 } } @@ -59,81 +70,47 @@ 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 () +MuteMaster::set_soloed (bool yn) { - _muted_by_others = 0; -} - -void -MuteMaster::mod_muted_by_others (int32_t delta) -{ - if (delta < 0) { - if (_muted_by_others >= (uint32_t) abs (delta)) { - _muted_by_others += delta; - } else { - _muted_by_others = 0; - } - } else { - _muted_by_others += delta; - } -} - -void -MuteMaster::set_solo_level (SoloLevel l) -{ - _solo_level = l; + _soloed = yn; } gain_t MuteMaster::mute_gain_at (MutePoint mp) const { gain_t gain; - const SoloLevel l = _solo_level; - // cerr << "solo level = " << _solo_level << " selfmuted " << self_muted_at (mp) << " omute " << muted_by_others_at (mp) << endl; - if (Config->get_solo_mute_override()) { - if ((l == SelfSoloed) || (l == DownstreamSoloed)) { + if (_soloed) { gain = 1.0; - } else if (self_muted_at (mp)) { // self-muted - gain = Config->get_solo_mute_gain (); - } else if (l == UpstreamSoloed) { - gain = 1.0; - } else if (muted_by_others_at (mp)) { // muted by others - gain = Config->get_solo_mute_gain (); + } else if (muted_by_self_at (mp)) { + gain = 0.0; } else { - if (!_solo_ignore && _session.soloing()) { - gain = 0.0; + if (muted_by_others_at (mp)) { + 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 == SelfSoloed) || (l == DownstreamSoloed)) { - gain = 1.0; - } else if (muted_by_others_at (mp)) { // muted by others - gain = Config->get_solo_mute_gain (); - } else if (l == UpstreamSoloed) { // soloed by others + if (muted_by_self_at (mp)) { + gain = 0.0; + } else if (_soloed) { gain = 1.0; } else { - if (!_solo_ignore && _session.soloing()) { - gain = 0.0; + if (muted_by_others_at (mp)) { + gain = Config->get_solo_mute_gain (); } else { gain = 1.0; } } } - - // cerr << "\tgain = " << gain << endl; - + return gain; } @@ -143,19 +120,17 @@ MuteMaster::set_mute_points (const std::string& 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 */ } } 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 */ } } @@ -167,21 +142,12 @@ MuteMaster::set_state (const XMLNode& node, int /*version*/) 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 ((prop = node.property ("muted")) != 0) { - _self_muted = string_is_affirmative (prop->value()); + _muted_by_self = PBD::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; + _muted_by_self = (_mute_point != MutePoint (0)); } return 0; @@ -192,11 +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", (_self_muted ? X_("yes") : X_("no"))); - - char buf[32]; - snprintf (buf, sizeof (buf), "%u", _muted_by_others); - node->add_property ("muted-by-others", buf); - + 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)); +} +