smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-08 14:45:43 +01:00
Code Issues Projects Releases Wiki Activity

Make Session::backend_sync_callback() emit Session::Located

Browse source 
If we sync to jackd AudioEngine::transport_frame() is not yet updated when
Session emits Located. Then the playhead ends up in an obsolete
position. Therefore we emit Session::Located() also from within
Session::backend_sync_callback() as that is called when AudioEngine is done
with the relocation.
This commit is contained in:
Johannes Mueller 2017-06-09 21:24:57 +02:00 • committed by Robin Gareus
parent ae837b49ed
commit 2770444b0c
1 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

11
libs/ardour/session_time.cc
View file

@ -183,19 +183,26 @@ int
Session::backend_sync_callback (TransportState state, framepos_t pos)
{
bool slave = synced_to_engine();
// cerr << "Session::backend_sync_callback() _transport_frame: " << _transport_frame << " pos: " << pos << " audible_frame: " << audible_frame() << endl;
if (slave) {
// cerr << "Session::backend_sync_callback() emitting Located()" << endl;
Located (); /* EMIT SIGNAL */
}
switch (state) {
case TransportStopped:
if (slave && _transport_frame != pos && post_transport_work() == 0) {
request_locate (pos, false);
// cerr << "SYNC: stopped, locate to " << pos->frame << " from " << _transport_frame << endl;
// cerr << "SYNC: stopped, locate to " << pos << " from " << _transport_frame << endl;
return false;
} else {
// cerr << "SYNC: stopped, nothing to do" << endl;
return true;
}
case TransportStarting:
// cerr << "SYNC: starting @ " << pos->frame << " a@ " << _transport_frame << " our work = " << post_transport_work() << " pos matches ? " << (_transport_frame == pos->frame) << endl;
// cerr << "SYNC: starting @ " << pos << " a@ " << _transport_frame << " our work = " << post_transport_work() << " pos matches ? " << (_transport_frame == pos) << endl;
if (slave) {
return _transport_frame == pos && post_transport_work() == 0;
} else {