diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2009-06-23 23:16:01 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2009-06-23 23:16:01 +0000 |
| commit | b10ace15cd23d4cfb999626711b8afc9acc85e04 (patch) | |
| tree | 07ded8ec1e40cc462961845087ff80b96fdabd4d /libs/ardour/delivery.cc | |
| parent | acaf05db1dd1dee9bcd7d1be4258c00837b90267 (diff) | |
make solo-in-front controllable. a few tweaks left to do.
git-svn-id: svn://localhost/ardour2/branches/3.0@5266 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/delivery.cc')
| -rw-r--r-- | libs/ardour/delivery.cc | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/libs/ardour/delivery.cc b/libs/ardour/delivery.cc index 1b1f62c4b2..8a13a4b047 100644 --- a/libs/ardour/delivery.cc +++ b/libs/ardour/delivery.cc @@ -399,30 +399,30 @@ Delivery::target_gain () } gain_t desired_gain; - MuteMaster::MutePoint mp; - - switch (_role) { - case Main: - mp = MuteMaster::Main; - break; - case Listen: - mp = MuteMaster::Listen; - break; - case Send: - case Insert: - if (_placement == PreFader) { - mp = MuteMaster::PreFader; - } else { - mp = MuteMaster::PostFader; - } - break; - } - if (_solo_level) { desired_gain = 1.0; } else { + MuteMaster::MutePoint mp; + + switch (_role) { + case Main: + mp = MuteMaster::Main; + break; + case Listen: + mp = MuteMaster::Listen; + break; + case Send: + case Insert: + if (_placement == PreFader) { + mp = MuteMaster::PreFader; + } else { + mp = MuteMaster::PostFader; + } + break; + } + if (_solo_isolated) { /* ... but we are isolated from all that nonsense */ |