From b2b5c965c854d222f70080de5fcafb10b75ff40b Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Sun, 10 Apr 2016 18:20:11 -0400 Subject: some tweaks for solo logic to get things working as they were before (correctly) --- gtk2_ardour/ardour_ui.cc | 3 +++ gtk2_ardour/route_ui.cc | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'gtk2_ardour') diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index 65b882fe6d..6ecfd9772c 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -5589,6 +5589,9 @@ void ARDOUR_UI::cancel_solo () { if (_session) { + if (_session) { + _session->set_controls (route_list_to_control_list (_session->get_routes(), &Route::solo_control), 0.0, Controllable::NoGroup); + } _session->clear_all_solo_state (_session->get_routes()); // safeguard, ideally this won't do anything, check the log-window } } diff --git a/gtk2_ardour/route_ui.cc b/gtk2_ardour/route_ui.cc index 1d5d8c731c..730cc05514 100644 --- a/gtk2_ardour/route_ui.cc +++ b/gtk2_ardour/route_ui.cc @@ -1116,7 +1116,7 @@ RouteUI::send_blink (bool onoff) Gtkmm2ext::ActiveState RouteUI::solo_active_state (boost::shared_ptr r) { - if (r->is_master() || r->is_monitor()) { + if (!r->can_solo()) { return Gtkmm2ext::Off; } @@ -1207,7 +1207,7 @@ RouteUI::update_solo_display () /* some changes to solo status can affect mute display, so catch up */ - update_mute_display (); + update_mute_display (); } void -- cgit v1.2.3