ardour/livetrax
13
0
Fork 0
Code

fix websockets toggle_roll

Browse Source 
Also fix BasicUI::toggle_roll who is supposed to do
the same as spacebar but doesn't.
This commit is contained in:
Remi Thebault 2022-01-09 23:30:39 +01:00 committed by Robin Gareus
parent d5df5847e1
commit a77ac7107f
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libs/surfaces/control_protocol/basic_ui.cc
View File

@ -623,7 +623,7 @@ BasicUI::toggle_click ()
} }
void void
BasicUI::toggle_roll (bool roll_out_of_bounded_mode) BasicUI::toggle_roll (bool with_abort, bool roll_out_of_bounded_mode)
{ {
/* TO BE KEPT IN SYNC WITH ARDOUR_UI::toggle_roll() */ /* TO BE KEPT IN SYNC WITH ARDOUR_UI::toggle_roll() */
@ -672,7 +672,7 @@ BasicUI::toggle_roll (bool roll_out_of_bounded_mode)
} }
} else { } else {
session->request_stop (true, true); session->request_stop (with_abort, true);
} }
} else { /* not rolling */ } else { /* not rolling */

2
libs/surfaces/control_protocol/control_protocol/basic_ui.h
View File

@ -108,7 +108,7 @@ class LIBCONTROLCP_API BasicUI {
void quick_snapshot_stay (); void quick_snapshot_stay ();
void quick_snapshot_switch (); void quick_snapshot_switch ();
void toggle_roll(bool roll_out_of_bounded_mode=true); //this provides the same operation as the "spacebar", it's a lot smarter than "play". void toggle_roll(bool with_abort, bool roll_out_of_bounded_mode); //this provides the same operation as the "spacebar", it's a lot smarter than "play".
void stop_forget(); void stop_forget();

2
libs/surfaces/websockets/transport.cc
View File

@ -75,7 +75,7 @@ ArdourTransport::set_roll (bool value)
{ {
if ((value && !roll ()) || (!value && roll ())) { if ((value && !roll ()) || (!value && roll ())) {
// this call is equivalent to hitting the spacebar // this call is equivalent to hitting the spacebar
basic_ui ().toggle_roll (false); basic_ui ().toggle_roll (false, false);
} }
} }