summaryrefslogtreecommitdiff
path: root/libs/surfaces/us2400
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2019-12-29 18:43:37 -0700
committerPaul Davis <paul@linuxaudiosystems.com>2019-12-29 18:43:51 -0700
commit52aa405ce3a35dcd01dcf3ae9f44ecb948d0485d (patch)
tree85d80cda22a305fb8cabfbeaa60df42473b63666 /libs/surfaces/us2400
parente46e6f12a33373e187e5ce97973cc4a30d073f40 (diff)
use new Session API to deal with transport state
Transition to use BasicUI button state API to come
Diffstat (limited to 'libs/surfaces/us2400')
-rw-r--r--libs/surfaces/us2400/mcp_buttons.cc4
-rw-r--r--libs/surfaces/us2400/us2400_control_protocol.cc2
2 files changed, 3 insertions, 3 deletions
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);