, _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;
}
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));
+ /* note: this is currently called with the assumption that the owner is
+ not soloed. it does not test for this condition.
+ */
+ return (!_solo_ignore && _session.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;
}