diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2016-04-15 00:38:03 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2016-05-31 15:30:41 -0400 |
| commit | 6de4953be8dc5cd413b405d4801f086567923965 (patch) | |
| tree | 4e428efc0668e9dc78d8cfee407042b7f976742d /libs/ardour/route.cc | |
| parent | 7d493b091ae2741db39a65cc62e9d17ef57d7606 (diff) | |
a variety of changes that get closer to correctly functioning behaviour for VCA solo+mute (BUT ARE NOT DONE YET)
Diffstat (limited to 'libs/ardour/route.cc')
| -rw-r--r-- | libs/ardour/route.cc | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/libs/ardour/route.cc b/libs/ardour/route.cc index a45e30a91b..7da7e42abf 100644 --- a/libs/ardour/route.cc +++ b/libs/ardour/route.cc @@ -5481,27 +5481,13 @@ Route::vca_unassign (boost::shared_ptr<VCA> vca) bool Route::muted_by_others_soloing () const { - // This method is only used by route_ui for display state. - // The DSP version is MuteMaster::muted_by_others_at() - if (!can_be_muted_by_others ()) { return false; } - return _session.soloing() && !_solo_control->soloed() && !_solo_isolate_control->solo_isolated(); -} - -bool -Route::muted_by_others () const -{ - // This method is only used by route_ui for display state. - // The DSP version is MuteMaster::muted_by_others_at() - - if (!can_be_muted_by_others()) { - return false; - } + /* XXX something needed here re: mute-overrides-solo */ - return _mute_master->muted_by_others(); + return _session.soloing() && !_solo_control->soloed() && !_solo_isolate_control->solo_isolated(); } void |