ardour/ardour
ardour/ardour
13
1
Fork 0
Code Pull Requests Releases Activity

fix a bad transition in the transportFSM.

Browse Source
This commit is contained in:
Paul Davis 2019-11-04 14:35:18 -07:00
parent 62c4e88a9d
commit 7d67789a3f
2 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libs/ardour/session_transport.cc
View File

@ -384,13 +384,7 @@ Session::do_locate (samplepos_t target_sample, bool with_roll, bool with_flush,
if (need_butler) {
TFSM_EVENT (TransportFSM::ButlerRequired);
} else {
if (!for_loop_end) {
/* loop end locates do not trigger a state transition
in the TFSM, because we do not change transport
state nor do we wait for the butler.
*/
TFSM_EVENT (TransportFSM::LocateDone);
}
TFSM_EVENT (TransportFSM::LocateDone);
}
loop_changing = false;

21
libs/ardour/transport_fsm.cc
View File

@ -188,6 +188,7 @@ TransportFSM::bad_transition (Event const & ev)
{
error << "bad transition, current state = " << current_state() << " event = " << enum_2_string (ev.type) << endmsg;
std::cerr << "bad transition, current state = " << current_state() << " event = " << enum_2_string (ev.type) << std::endl;
PBD::stacktrace (std::cerr, 30);
}
bool
@ -261,11 +262,21 @@ TransportFSM::process_event (Event& ev, bool already_deferred, bool& deferred)
break;
case Rolling:
if (ev.with_loop) {
/* no state transitions. Just do a realtime
locate and continue rolling. Note that
ev.with_roll is ignored and assumed to be
true because we're looping.
*/
/* we will finish the locate synchronously, so
* that after returning from
* ::locate_for_loop() we will already have
* received (and re-entrantly handled)
* LocateDone and returned back to Rolling.
*
* This happens because we only need to do a
* realtime locate and continue rolling. No
* disk I/O is required - the loop is
* automically present in buffers already.
*
* Note that ev.with_roll is ignored and
* assumed to be true because we're looping.
*/
transition (WaitingForLocate);
locate_for_loop (ev);
} else {
transition (DeclickToLocate);