From 52aa405ce3a35dcd01dcf3ae9f44ecb948d0485d Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Sun, 29 Dec 2019 18:43:37 -0700 Subject: use new Session API to deal with transport state Transition to use BasicUI button state API to come --- libs/surfaces/us2400/mcp_buttons.cc | 4 ++-- libs/surfaces/us2400/us2400_control_protocol.cc | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'libs/surfaces/us2400') diff --git a/libs/surfaces/us2400/mcp_buttons.cc b/libs/surfaces/us2400/mcp_buttons.cc index af0f268d1d..38657ef3aa 100644 --- a/libs/surfaces/us2400/mcp_buttons.cc +++ b/libs/surfaces/us2400/mcp_buttons.cc @@ -458,7 +458,7 @@ US2400Protocol::marker_release (Button &) samplepos_t where = session->audible_sample(); - if (session->transport_stopped() && session->locations()->mark_at (where, session->sample_rate() / 100.0)) { + if (session->transport_stopped_or_stopping() && session->locations()->mark_at (where, session->sample_rate() / 100.0)) { return off; } @@ -487,7 +487,7 @@ US2400Protocol::stop_press (Button &) LedState US2400Protocol::stop_release (Button &) { - return session->transport_stopped(); + return session->transport_stopped_or_stopping(); } LedState diff --git a/libs/surfaces/us2400/us2400_control_protocol.cc b/libs/surfaces/us2400/us2400_control_protocol.cc index 3deee55f41..1467d41770 100644 --- a/libs/surfaces/us2400/us2400_control_protocol.cc +++ b/libs/surfaces/us2400/us2400_control_protocol.cc @@ -1063,7 +1063,7 @@ US2400Protocol::notify_transport_state_changed() // switch various play and stop buttons on / off update_global_button (Button::Play, session->transport_speed() == 1.0); - update_global_button (Button::Stop, session->transport_stopped ()); + update_global_button (Button::Stop, session->transport_stopped_or_stopping ()); update_global_button (Button::Rewind, session->transport_speed() < 0.0); update_global_button (Button::Ffwd, session->transport_speed() > 1.0); -- cgit v1.2.3