a slew of as-yet incomplete work to get VCA solo+mute closer to working

This commit is contained in:
Paul Davis 2016-04-11 16:37:51 -04:00
parent 86a9fb2844
commit e1bcd70712
13 changed files with 51 additions and 97 deletions

View file

@ -1225,10 +1225,12 @@ RouteUI::mute_active_state (Session* s, boost::shared_ptr<Route> r)
if (Config->get_show_solo_mutes() && !Config->get_solo_control_is_listen_control ()) {
cerr << r->name() << " muted " << r->muted () << " others-soloing " << r->muted_by_others_soloing() << " master " << r->mute_control()->get_masters_value() << endl;
if (r->muted ()) {
/* full mute */
return Gtkmm2ext::ExplicitActive;
} else if (r->muted_by_others_soloing ()) {
} else if (r->muted_by_others_soloing () || r->mute_control()->get_masters_value()) {
/* this will reflect both solo mutes AND master mutes */
return Gtkmm2ext::ImplicitActive;
} else {