diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2010-05-03 22:07:47 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2010-05-03 22:07:47 +0000 |
| commit | dda06229570980a61de8a9395c1539958cc30b0f (patch) | |
| tree | 6339b9214121750de658d26729b022d5295e517f /libs/ardour/mute_master.cc | |
| parent | e33d4553b2b333c30835b00741fc5c1fd0e2b36d (diff) | |
the great solo model simplification (without much code removal)
git-svn-id: svn://localhost/ardour2/branches/3.0@7049 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/mute_master.cc')
| -rw-r--r-- | libs/ardour/mute_master.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libs/ardour/mute_master.cc b/libs/ardour/mute_master.cc index 5e49a11875..b06a64e72f 100644 --- a/libs/ardour/mute_master.cc +++ b/libs/ardour/mute_master.cc @@ -99,11 +99,11 @@ MuteMaster::mute_gain_at (MutePoint mp) const // 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 ((l == SelfSoloed) || (l == UpstreamSoloed)) { gain = 1.0; } else if (self_muted_at (mp)) { // self-muted gain = Config->get_solo_mute_gain (); - } else if (l == UpstreamSoloed) { + } else if (l == DownstreamSoloed) { gain = 1.0; } else if (muted_by_others_at (mp)) { // muted by others gain = Config->get_solo_mute_gain (); @@ -117,11 +117,11 @@ MuteMaster::mute_gain_at (MutePoint mp) const } else { if (self_muted_at (mp)) { // self-muted gain = Config->get_solo_mute_gain (); - } else if ((l == SelfSoloed) || (l == DownstreamSoloed)) { + } else if ((l == SelfSoloed) || (l == UpstreamSoloed)) { 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 + } else if (l == DownstreamSoloed) { // soloed by others gain = 1.0; } else { if (!_solo_ignore && _session.soloing()) { |