smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-11 00:56:33 +01:00
Code Issues Projects Releases Wiki Activity

use new Session API to deal with transport state

Browse source 
Transition to use BasicUI button state API to come
This commit is contained in:
Paul Davis 2019-12-29 18:43:37 -07:00
parent e46e6f12a3
commit 52aa405ce3
6 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libs/surfaces/cc121/cc121.cc
View file

@ -680,7 +680,7 @@ CC121::map_transport_state ()
start_blinking (Play); start_blinking (Play);
} }
get_button (Stop).set_led_state (_output_port, session->transport_stopped ()); 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 (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 (Ffwd).set_led_state (_output_port, session->transport_speed() > 1.0);
get_button (Jog).set_led_state (_output_port, _jogmode == scroll); get_button (Jog).set_led_state (_output_port, _jogmode == scroll);

2
libs/surfaces/faderport/faderport.cc
View file

@ -718,7 +718,7 @@ FaderPort::map_transport_state ()
start_blinking (Play); start_blinking (Play);
} }
get_button (Stop).set_led_state (_output_port, session->transport_stopped ()); 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 (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 (Ffwd).set_led_state (_output_port, session->transport_speed() > 1.0);
} }

2
libs/surfaces/faderport8/actions.cc
View file

@ -588,7 +588,7 @@ FaderPort8::button_encoder ()
* the current position and we're not rolling. * the current position and we're not rolling.
*/ */
samplepos_t where = session->audible_sample(); 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; return;
} }

2
libs/surfaces/osc/osc_global_observer.cc
View file

@ -415,7 +415,7 @@ OSCGlobalObserver::send_transport_state_changed()
_osc.float_message (X_("/loop_toggle"), session->get_play_loop(), addr); _osc.float_message (X_("/loop_toggle"), session->get_play_loop(), addr);
_osc.float_message (X_("/transport_play"), session->transport_speed() == 1.0, addr); _osc.float_message (X_("/transport_play"), session->transport_speed() == 1.0, addr);
_osc.float_message (X_("/toggle_roll"), session->transport_speed() == 1.0, addr); _osc.float_message (X_("/toggle_roll"), session->transport_speed() == 1.0, addr);
_osc.float_message (X_("/transport_stop"), session->transport_stopped(), addr); _osc.float_message (X_("/transport_stop"), session->transport_stopped_or_stopping(), addr);
_osc.float_message (X_("/rewind"), session->transport_speed() < 0.0, addr); _osc.float_message (X_("/rewind"), session->transport_speed() < 0.0, addr);
_osc.float_message (X_("/ffwd"), (session->transport_speed() != 1.0 && session->transport_speed() > 0.0), addr); _osc.float_message (X_("/ffwd"), (session->transport_speed() != 1.0 && session->transport_speed() > 0.0), addr);
} }

4
libs/surfaces/us2400/mcp_buttons.cc
View file

@ -458,7 +458,7 @@ US2400Protocol::marker_release (Button &)
samplepos_t where = session->audible_sample(); 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; return off;
} }
@ -487,7 +487,7 @@ US2400Protocol::stop_press (Button &)
LedState LedState
US2400Protocol::stop_release (Button &) US2400Protocol::stop_release (Button &)
{ {
return session->transport_stopped(); return session->transport_stopped_or_stopping();
} }
LedState LedState

2
libs/surfaces/us2400/us2400_control_protocol.cc
View file

@ -1063,7 +1063,7 @@ US2400Protocol::notify_transport_state_changed()
// switch various play and stop buttons on / off // switch various play and stop buttons on / off
update_global_button (Button::Play, session->transport_speed() == 1.0); 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::Rewind, session->transport_speed() < 0.0);
update_global_button (Button::Ffwd, session->transport_speed() > 1.0); update_global_button (Button::Ffwd, session->transport_speed() > 1.0);