diff options
| author | Robin Gareus <robin@gareus.org> | 2017-06-09 23:24:37 +0200 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2017-06-09 23:25:42 +0200 |
| commit | 18db6e3f508cb124b8fb034d335a24afb4935ca3 (patch) | |
| tree | 5d2f20d75eb19f4d4fb0c47bcc7d29d1f02ac804 /libs/ardour/mute_master.cc | |
| parent | a1b4f9b8abf2887b17bce05403ea7eab2421f26a (diff) | |
NO-OP: whitespace
Diffstat (limited to 'libs/ardour/mute_master.cc')
| -rw-r--r-- | libs/ardour/mute_master.cc | 81 |
1 files changed, 40 insertions, 41 deletions
diff --git a/libs/ardour/mute_master.cc b/libs/ardour/mute_master.cc index 52af8c3861..9cc424b84d 100644 --- a/libs/ardour/mute_master.cc +++ b/libs/ardour/mute_master.cc @@ -1,5 +1,4 @@ /* - Copyright (C) 2009 Paul Davis This program is free software; you can redistribute it and/or modify @@ -44,9 +43,9 @@ 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) + , _muted_by_self (false) + , _soloed_by_self (false) + , _soloed_by_others (false) , _muted_by_masters (0) { @@ -88,56 +87,56 @@ MuteMaster::unmute_at (MutePoint mp) gain_t MuteMaster::mute_gain_at (MutePoint mp) const { - gain_t gain; - - if (Config->get_solo_mute_override()) { - if (_soloed_by_self) { - gain = GAIN_COEFF_UNITY; - } else if (muted_by_self_at (mp) || muted_by_masters_at (mp)) { - gain = GAIN_COEFF_ZERO; - } else { - 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) || 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_soloing_at (mp)) { - gain = Config->get_solo_mute_gain (); - } else { - gain = GAIN_COEFF_UNITY; - } - } - } - - return gain; + gain_t gain; + + if (Config->get_solo_mute_override()) { + if (_soloed_by_self) { + gain = GAIN_COEFF_UNITY; + } else if (muted_by_self_at (mp) || muted_by_masters_at (mp)) { + gain = GAIN_COEFF_ZERO; + } else { + 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) || 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_soloing_at (mp)) { + gain = Config->get_solo_mute_gain (); + } else { + gain = GAIN_COEFF_UNITY; + } + } + } + + return gain; } void MuteMaster::set_mute_points (const std::string& mute_point) { - MutePoint old = _mute_point; + MutePoint old = _mute_point; _mute_point = (MutePoint) string_2_enum (mute_point, _mute_point); - if (old != _mute_point) { - MutePointChanged(); /* EMIT SIGNAL */ - } + if (old != _mute_point) { + MutePointChanged(); /* EMIT SIGNAL */ + } } void MuteMaster::set_mute_points (MutePoint mp) { - if (_mute_point != mp) { - _mute_point = mp; - MutePointChanged (); /* EMIT SIGNAL */ - } + if (_mute_point != mp) { + _mute_point = mp; + MutePointChanged (); /* EMIT SIGNAL */ + } } int |