diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2016-04-20 23:22:29 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2016-05-31 15:30:41 -0400 |
| commit | 69250b64ea00671ab05d852833006e483a53cd8b (patch) | |
| tree | 8b6f464e9c35271c44a98173c4d072dbf6ad507a /gtk2_ardour | |
| parent | 202ddba9e2a62fa0b5a387c139badee2757a90ce (diff) | |
move ever close to working master/slave logic, this time with audio testing
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/route_ui.cc | 4 | ||||
| -rw-r--r-- | gtk2_ardour/vca_master_strip.cc | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/gtk2_ardour/route_ui.cc b/gtk2_ardour/route_ui.cc index 67de68aa69..bfd3ed1006 100644 --- a/gtk2_ardour/route_ui.cc +++ b/gtk2_ardour/route_ui.cc @@ -1228,7 +1228,7 @@ RouteUI::mute_active_state (Session* s, boost::shared_ptr<Route> r) if (r->mute_control()->muted_by_self ()) { /* full mute */ return Gtkmm2ext::ExplicitActive; - } else if (r->muted_by_others_soloing () || r->muted_by_others()) { + } else if (r->muted_by_others_soloing () || r->muted_by_masters ()) { /* this will reflect both solo mutes AND master mutes */ return Gtkmm2ext::ImplicitActive; } else { @@ -1241,7 +1241,7 @@ RouteUI::mute_active_state (Session* s, boost::shared_ptr<Route> r) if (r->mute_control()->muted_by_self()) { /* full mute */ return Gtkmm2ext::ExplicitActive; - } else if (r->muted_by_others()) { + } else if (r->muted_by_masters ()) { /* this shows only master mutes, not mute-by-others-soloing */ return Gtkmm2ext::ImplicitActive; } else { diff --git a/gtk2_ardour/vca_master_strip.cc b/gtk2_ardour/vca_master_strip.cc index 6f43228424..c1615edab7 100644 --- a/gtk2_ardour/vca_master_strip.cc +++ b/gtk2_ardour/vca_master_strip.cc @@ -237,10 +237,9 @@ VCAMasterStrip::set_solo_text () void VCAMasterStrip::mute_changed () { - std::cerr << "Mute changed for " << _vca->number() << std::endl; if (_vca->mute_control()->muted_by_self()) { mute_button.set_active_state (ExplicitActive); - } else if (_vca->mute_control()->muted_by_others()) { + } else if (_vca->mute_control()->muted_by_masters ()) { mute_button.set_active_state (ImplicitActive); } else { mute_button.set_active_state (Gtkmm2ext::Off); |