ardour/livetrax
13
0
Fork 0
Code

use new BasicUI and Session API to deal with transport state

Browse Source
This commit is contained in:
Paul Davis 2019-12-29 18:43:07 -07:00
parent a8cc5b1303
commit e46e6f12a3
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libs/surfaces/mackie/mackie_control_protocol.cc
View File

@ -486,6 +486,8 @@ MackieControlProtocol::set_active (bool yn)
redisplay_connection = redisplay_timeout->connect (sigc::mem_fun (*this, &MackieControlProtocol::redisplay)); redisplay_connection = redisplay_timeout->connect (sigc::mem_fun (*this, &MackieControlProtocol::redisplay));
redisplay_timeout->attach (main_loop()->get_context()); redisplay_timeout->attach (main_loop()->get_context());
notify_transport_state_changed ();
} else { } else {
BaseUI::quit (); BaseUI::quit ();
@ -1342,11 +1344,11 @@ MackieControlProtocol::notify_transport_state_changed()
} }
// switch various play and stop buttons on / off // switch various play and stop buttons on / off
update_global_button (Button::Loop, session->get_play_loop()); update_global_button (Button::Loop, loop_button_onoff ());
update_global_button (Button::Play, session->transport_speed() == 1.0); update_global_button (Button::Play, play_button_onoff ());
update_global_button (Button::Stop, session->transport_stopped ()); update_global_button (Button::Stop, stop_button_onoff ());
update_global_button (Button::Rewind, session->transport_speed() < 0.0); update_global_button (Button::Rewind, rewind_button_onoff ());
update_global_button (Button::Ffwd, session->transport_speed() > 1.0); update_global_button (Button::Ffwd, ffwd_button_onoff ());
// sometimes a return to start leaves time code at old time // sometimes a return to start leaves time code at old time
_timecode_last = string (10, ' '); _timecode_last = string (10, ' ');

4
libs/surfaces/mackie/mcp_buttons.cc
View File

@ -472,7 +472,7 @@ MackieControlProtocol::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;
} }
@ -501,7 +501,7 @@ MackieControlProtocol::stop_press (Button &)
LedState LedState
MackieControlProtocol::stop_release (Button &) MackieControlProtocol::stop_release (Button &)
{ {
return session->transport_stopped(); return session->transport_stopped_or_stopping();
} }
LedState LedState