diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2016-05-21 12:44:41 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2016-05-31 15:30:44 -0400 |
| commit | f022784014d4ae1b3bb75a1c02f206ba8a28d7d6 (patch) | |
| tree | 7582499a02aa75b8d7c2c7a8173daa2b1ba54302 /gtk2_ardour/route_ui.cc | |
| parent | 2380bbae5bd77e39020ef779f1ae4a3255ca1e8a (diff) | |
convert editor routes code to use Stripable
Diffstat (limited to 'gtk2_ardour/route_ui.cc')
| -rw-r--r-- | gtk2_ardour/route_ui.cc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/gtk2_ardour/route_ui.cc b/gtk2_ardour/route_ui.cc index 1175aa620a..0a1faeaa67 100644 --- a/gtk2_ardour/route_ui.cc +++ b/gtk2_ardour/route_ui.cc @@ -1114,15 +1114,15 @@ RouteUI::send_blink (bool onoff) } Gtkmm2ext::ActiveState -RouteUI::solo_active_state (boost::shared_ptr<Route> r) +RouteUI::solo_active_state (boost::shared_ptr<Stripable> s) { - if (!r->can_solo()) { + if (!s->solo_control()->can_solo()) { return Gtkmm2ext::Off; } - if (r->self_soloed()) { + if (s->solo_control()->self_soloed()) { return Gtkmm2ext::ExplicitActive; - } else if (r->soloed_by_others()) { + } else if (s->solo_control()->soloed_by_others()) { return Gtkmm2ext::ImplicitActive; } else { return Gtkmm2ext::Off; @@ -1130,7 +1130,7 @@ RouteUI::solo_active_state (boost::shared_ptr<Route> r) } Gtkmm2ext::ActiveState -RouteUI::solo_isolate_active_state (boost::shared_ptr<Route> r) +RouteUI::solo_isolate_active_state (boost::shared_ptr<Stripable> r) { if (r->is_master() || r->is_monitor()) { return Gtkmm2ext::Off; @@ -1144,7 +1144,7 @@ RouteUI::solo_isolate_active_state (boost::shared_ptr<Route> r) } Gtkmm2ext::ActiveState -RouteUI::solo_safe_active_state (boost::shared_ptr<Route> r) +RouteUI::solo_safe_active_state (boost::shared_ptr<Stripable> r) { if (r->is_master() || r->is_monitor()) { return Gtkmm2ext::Off; @@ -1205,7 +1205,7 @@ RouteUI::solo_changed_so_update_mute () } ActiveState -RouteUI::mute_active_state (Session* s, boost::shared_ptr<Route> r) +RouteUI::mute_active_state (Session* s, boost::shared_ptr<Stripable> r) { if (r->is_monitor()) { return ActiveState(0); @@ -1216,7 +1216,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_masters ()) { + } else if (r->mute_control()->muted_by_others_soloing () || r->mute_control()->muted_by_masters ()) { /* this will reflect both solo mutes AND master mutes */ return Gtkmm2ext::ImplicitActive; } else { @@ -1229,7 +1229,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_masters ()) { + } else if (r->mute_control()->muted_by_masters ()) { /* this shows only master mutes, not mute-by-others-soloing */ return Gtkmm2ext::ImplicitActive; } else { |