ardour/livetrax
13
0
Fork 0
Code

no more locate-restart based on mismatch transport_frame and locate target

Browse Source
This commit is contained in:
Paul Davis 2017-07-28 13:37:11 -04:00
parent 8033fd9912
commit 828b95b526
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libs/ardour/session_transport.cc
View File

@ -585,23 +585,16 @@ Session::non_realtime_locate ()
microseconds_t begin = get_microseconds (); microseconds_t begin = get_microseconds ();
const framepos_t tf = _transport_frame;
{ {
boost::shared_ptr<RouteList> rl = routes.reader(); boost::shared_ptr<RouteList> rl = routes.reader();
restart:
const framepos_t tf = _transport_frame;
cerr << "\n\n >>> START Non-RT locate on routes to " << tf << "\n\n"; cerr << "\n\n >>> START Non-RT locate on routes to " << tf << "\n\n";
for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) { for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) {
(*i)->non_realtime_locate (_transport_frame); (*i)->non_realtime_locate (tf);
if (tf != _transport_frame) {
/* new locate request arrived while processing
this one. start over.
*/
cerr << "\n\n\n\n RESTART LOCATE @ " << _transport_frame << endl;
goto restart;
}
} }
cerr << "\n\n <<< DONE Non-RT locate on routes\n\n"; cerr << "\n\n <<< DONE Non-RT locate on routes\n\n";
@ -610,7 +603,7 @@ Session::non_realtime_locate ()
{ {
VCAList v = _vca_manager->vcas (); VCAList v = _vca_manager->vcas ();
for (VCAList::const_iterator i = v.begin(); i != v.end(); ++i) { for (VCAList::const_iterator i = v.begin(); i != v.end(); ++i) {
(*i)->non_realtime_locate (_transport_frame); (*i)->non_realtime_locate (tf);
} }
} }