allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Activity

show VCA master mute state in RouteUI, even if Config->get_show_solo_mutes() is false (since it is orthogonal)

Browse Source
This commit is contained in:
Paul Davis
2016-03-12 22:59:00 -05:00
parent 194b213456
commit c107f1ab56
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
gtk2_ardour/route_ui.cc
View File

@@ -1243,13 +1243,13 @@ RouteUI::mute_active_state (Session* s, boost::shared_ptr<Route> r)
return ActiveState(0);
}
if (Config->get_show_solo_mutes() && !Config->get_solo_control_is_listen_control ()) {
if (r->muted ()) {
/* full mute */
return Gtkmm2ext::ExplicitActive;
} else if (r->muted_by_others()) {
} else if (r->muted_by_others ()) {
/* this will reflect both solo mutes AND master mutes */
return Gtkmm2ext::ImplicitActive;
} else {
/* no mute at all */
@@ -1261,6 +1261,12 @@ RouteUI::mute_active_state (Session* s, boost::shared_ptr<Route> r)
if (r->muted()) {
/* full mute */
return Gtkmm2ext::ExplicitActive;
} else if (r->mute_master()->muted_by_others()) {
/* note the direct use of MuteMaster API here. We are
not interested in showing
others-soloed-so-this-muted status in this branch.
*/
return Gtkmm2ext::ImplicitActive;
} else {
/* no mute at all */
return Gtkmm2ext::Off;