From 6de4953be8dc5cd413b405d4801f086567923965 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Fri, 15 Apr 2016 00:38:03 -0400 Subject: a variety of changes that get closer to correctly functioning behaviour for VCA solo+mute (BUT ARE NOT DONE YET) --- libs/ardour/route.cc | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) (limited to 'libs/ardour/route.cc') 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) 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 -- cgit v1.2.3