From 48c520a4ef4c3eabce0269482e0ccc111b768f1b Mon Sep 17 00:00:00 2001 From: Ben Loftis Date: Tue, 17 Oct 2017 09:20:18 -0500 Subject: [PATCH] US2400: explicitly toggle switch state in some cases where everything should reset. --- libs/surfaces/us2400/strip.cc | 9 +++++++++ libs/surfaces/us2400/us2400_control_protocol.cc | 10 ++++++++++ 2 files changed, 19 insertions(+) diff --git a/libs/surfaces/us2400/strip.cc b/libs/surfaces/us2400/strip.cc index f8229d9369..1a88d39855 100644 --- a/libs/surfaces/us2400/strip.cc +++ b/libs/surfaces/us2400/strip.cc @@ -171,6 +171,15 @@ Strip::set_stripable (boost::shared_ptr r, bool /*with_messages*/) _fader->set_control (boost::shared_ptr()); _vpot->set_control (boost::shared_ptr()); + _surface->write (_solo->set_state(on)); + _surface->write (_solo->set_state(off)); + + _surface->write (_mute->set_state(on)); + _surface->write (_mute->set_state(off)); + + _surface->write (_select->set_state(on)); + _surface->write (_select->set_state(off)); + _stripable = r; reset_saved_values (); diff --git a/libs/surfaces/us2400/us2400_control_protocol.cc b/libs/surfaces/us2400/us2400_control_protocol.cc index 82292f4214..ea891bdb34 100644 --- a/libs/surfaces/us2400/us2400_control_protocol.cc +++ b/libs/surfaces/us2400/us2400_control_protocol.cc @@ -544,9 +544,19 @@ US2400Protocol::device_ready () DEBUG_TRACE (DEBUG::US2400, string_compose ("device ready init (active=%1)\n", active())); update_surfaces (); + update_global_button (Button::Send, on); update_global_button (Button::Send, off); + + update_global_button (Button::Scrub, on); update_global_button (Button::Scrub, off); + + update_global_button (Button::ClearSolo, on); + update_global_button (Button::ClearSolo, off); + + update_global_button (Button::Pan, off); update_global_button (Button::Pan, on); + + update_global_button (Button::Flip, on); update_global_button (Button::Flip, off); set_subview_mode (US2400Protocol::None, first_selected_stripable());