From d79d2807b185605b51ad0247fbf644b953d04650 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Sun, 29 Dec 2019 18:53:22 -0700 Subject: [PATCH] expand use of new BasicUI API for transport button state to all control surfaces --- libs/surfaces/cc121/cc121.cc | 6 +++--- libs/surfaces/faderport/faderport.cc | 6 +++--- libs/surfaces/us2400/us2400_control_protocol.cc | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/libs/surfaces/cc121/cc121.cc b/libs/surfaces/cc121/cc121.cc index d04a88f5cd..06b5d26334 100644 --- a/libs/surfaces/cc121/cc121.cc +++ b/libs/surfaces/cc121/cc121.cc @@ -680,9 +680,9 @@ CC121::map_transport_state () start_blinking (Play); } - get_button (Stop).set_led_state (_output_port, session->transport_stopped_or_stopping ()); - get_button (Rewind).set_led_state (_output_port, session->transport_speed() < 0.0); - get_button (Ffwd).set_led_state (_output_port, session->transport_speed() > 1.0); + get_button (Stop).set_led_state (_output_port, stop_button_onoff()); + get_button (Rewind).set_led_state (_output_port, rewind_button_onoff()); + get_button (Ffwd).set_led_state (_output_port, ffwd_button_onoff()); get_button (Jog).set_led_state (_output_port, _jogmode == scroll); } diff --git a/libs/surfaces/faderport/faderport.cc b/libs/surfaces/faderport/faderport.cc index 8f4954a3c2..ba7e7329af 100644 --- a/libs/surfaces/faderport/faderport.cc +++ b/libs/surfaces/faderport/faderport.cc @@ -718,9 +718,9 @@ FaderPort::map_transport_state () start_blinking (Play); } - get_button (Stop).set_led_state (_output_port, session->transport_stopped_or_stopping ()); - get_button (Rewind).set_led_state (_output_port, session->transport_speed() < 0.0); - get_button (Ffwd).set_led_state (_output_port, session->transport_speed() > 1.0); + get_button (Stop).set_led_state (_output_port, stop_button_onoff()); + get_button (Rewind).set_led_state (_output_port, rewind_button_onoff ()); + get_button (Ffwd).set_led_state (_output_port, ffwd_button_onoff()); } void diff --git a/libs/surfaces/us2400/us2400_control_protocol.cc b/libs/surfaces/us2400/us2400_control_protocol.cc index 1467d41770..dcaec531d1 100644 --- a/libs/surfaces/us2400/us2400_control_protocol.cc +++ b/libs/surfaces/us2400/us2400_control_protocol.cc @@ -1062,10 +1062,10 @@ 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_or_stopping ()); - update_global_button (Button::Rewind, session->transport_speed() < 0.0); - update_global_button (Button::Ffwd, session->transport_speed() > 1.0); + update_global_button (Button::Play, play_button_onoff()); + update_global_button (Button::Stop, stop_button_onoff()); + update_global_button (Button::Rewind, rewind_button_onoff()); + update_global_button (Button::Ffwd, ffwd_button_onoff()); // sometimes a return to start leaves time code at old time _timecode_last = string (10, ' ');