diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2010-03-08 02:14:23 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2010-03-08 02:14:23 +0000 |
| commit | b2bc408cef1715de0009c65ff082c6e914de1991 (patch) | |
| tree | 5a030e0aaa469a0670c97480366dbcf26958860d /libs/ardour/delivery.cc | |
| parent | 2085cddab3b1c8155b63c3c48304fffaa72c4e6c (diff) | |
remove yesterday's mayhem with MainListen and get afl/pfl sorta-kinda working
git-svn-id: svn://localhost/ardour2/branches/3.0@6742 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/delivery.cc')
| -rw-r--r-- | libs/ardour/delivery.cc | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/libs/ardour/delivery.cc b/libs/ardour/delivery.cc index 5d786597a9..238b7c3fa9 100644 --- a/libs/ardour/delivery.cc +++ b/libs/ardour/delivery.cc @@ -163,7 +163,6 @@ Delivery::display_name () const return _("main outs"); break; case Listen: - case MainListen: return _("listen"); break; case Send: @@ -370,8 +369,6 @@ Delivery::state (bool full_state) node.add_property("type", "main-outs"); } else if (_role & Listen) { node.add_property("type", "listen"); - } else if (_role & MainListen) { - node.add_property("type", "main-listen"); } else { node.add_property("type", "delivery"); } @@ -543,13 +540,7 @@ Delivery::target_gain () gain_t desired_gain = -1.0f; - if (_role == MainListen) { - - /* silent if anyone else soloing; unity gain otherwise */ - - desired_gain = (_session.soloing() ? 0.0 : 1.0); - - } else if (_solo_level) { + if (_solo_level) { desired_gain = 1.0; @@ -579,9 +570,6 @@ Delivery::target_gain () /* XXX FIX ME this is wrong, we need per-delivery muting */ mp = MuteMaster::PreFader; break; - case MainListen: - /* we can't get here, see if() above */ - break; } if (!_solo_isolated && _session.soloing()) { |