X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fmute_master.cc;h=4c23855915a519e8bb4a28dbe50786762054db1c;hb=8367b7cab344e75908744a95fda860c7fadff420;hp=9f2ed08dab5ce5f7fd4af3000d34dec150d7708b;hpb=d6051c9953ea8778399ad72fc91c334c242d25e0;p=ardour.git diff --git a/libs/ardour/mute_master.cc b/libs/ardour/mute_master.cc index 9f2ed08dab..4c23855915 100644 --- a/libs/ardour/mute_master.cc +++ b/libs/ardour/mute_master.cc @@ -31,6 +31,9 @@ using namespace ARDOUR; using namespace std; +const MuteMaster::MutePoint MuteMaster::AllPoints = MuteMaster::MutePoint( + PreFader|PostFader|Listen|Main); + MuteMaster::MuteMaster (Session& s, const std::string&) : SessionHandleRef (s) , _mute_point (MutePoint (0)) @@ -87,26 +90,26 @@ MuteMaster::mute_gain_at (MutePoint mp) const if (Config->get_solo_mute_override()) { if (_soloed) { - gain = 1.0; + gain = GAIN_COEFF_UNITY; } else if (muted_by_self_at (mp)) { - gain = 0.0; + gain = GAIN_COEFF_ZERO; } else { if (muted_by_others_at (mp)) { gain = Config->get_solo_mute_gain (); } else { - gain = 1.0; + gain = GAIN_COEFF_UNITY; } } } else { if (muted_by_self_at (mp)) { - gain = 0.0; + gain = GAIN_COEFF_ZERO; } else if (_soloed) { - gain = 1.0; + gain = GAIN_COEFF_UNITY; } else { if (muted_by_others_at (mp)) { gain = Config->get_solo_mute_gain (); } else { - gain = 1.0; + gain = GAIN_COEFF_UNITY; } } }