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

transport: use butler seek count, not PostTransportLocate to decide whether to call non_realtime_locate(), and update butler seek count at end

Browse source
This commit is contained in:
Paul Davis 2020-11-12 18:38:24 -07:00
parent ef4d825232
commit 8b048bb351
1 changed files with 13 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

17
libs/ardour/session_transport.cc
View file

@ -1193,8 +1193,11 @@ Session::butler_transport_work ()
} }
} }
if (ptw & PostTransportLocate) { const int butler = g_atomic_int_get (&_butler_seek_counter);
DEBUG_TRACE (DEBUG::Transport, "nonrealtime locate invoked from BTW\n"); const int rtlocates = g_atomic_int_get (&_seek_counter);
if (butler != rtlocates) {
DEBUG_TRACE (DEBUG::Transport, string_compose ("nonrealtime locate invoked from BTW (butler has done %1, rtlocs %2)\n", butler, rtlocates));
non_realtime_locate (); non_realtime_locate ();
} }
@ -1280,12 +1283,13 @@ Session::non_realtime_locate ()
uint32_t nt = 0; uint32_t nt = 0;
samplepos_t tf; samplepos_t tf;
gint sc;
{ {
boost::shared_ptr<RouteList> rl = routes.reader(); boost::shared_ptr<RouteList> rl = routes.reader();
restart: restart:
gint sc = g_atomic_int_get (&_seek_counter); sc = g_atomic_int_get (&_seek_counter);
tf = _transport_sample; tf = _transport_sample;
start = get_microseconds (); start = get_microseconds ();
@ -1299,13 +1303,18 @@ Session::non_realtime_locate ()
microseconds_t end = get_microseconds (); microseconds_t end = get_microseconds ();
int usecs_per_track = lrintf ((end - start) / (double) nt); int usecs_per_track = lrintf ((end - start) / (double) nt);
#ifndef NDEBUG #ifndef NDEBUG
std::cerr << "locate took " << (end - start) << " usecs for " << nt << " tracks = " << usecs_per_track << " per track\n"; std::cerr << "locate to " << tf << " took " << (end - start) << " usecs for " << nt << " tracks = " << usecs_per_track << " per track\n";
#endif #endif
if (usecs_per_track > g_atomic_int_get (&current_usecs_per_track)) { if (usecs_per_track > g_atomic_int_get (&current_usecs_per_track)) {
g_atomic_int_set (&current_usecs_per_track, usecs_per_track); g_atomic_int_set (&current_usecs_per_track, usecs_per_track);
} }
} }
/* we've caught up with whatever the _seek_counter was when we did the
non-realtime locates.
*/
g_atomic_int_set (&_butler_seek_counter, sc);
{ {
/* VCAs are quick to locate because they have no data (except /* VCAs are quick to locate because they have no data (except
automation) associated with them. Don't bother with a automation) associated with them. Don't bother with a