summaryrefslogtreecommitdiff
path: root/libs/ardour/session_transport.cc
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2017-07-28 13:37:11 -0400
committerPaul Davis <paul@linuxaudiosystems.com>2017-09-18 11:40:53 -0400
commit828b95b526d00fe775bf8d51c2439eef577bf07f (patch)
tree4d1335f3a466ef5bfb14ddf2eb7c5dff67665106 /libs/ardour/session_transport.cc
parent8033fd9912585c7325704cd077fe90e8f22414eb (diff)
no more locate-restart based on mismatch transport_frame and locate target
Diffstat (limited to 'libs/ardour/session_transport.cc')
-rw-r--r--libs/ardour/session_transport.cc15
1 files changed, 4 insertions, 11 deletions
diff --git a/libs/ardour/session_transport.cc b/libs/ardour/session_transport.cc
index 07369fff67..494f167198 100644
--- a/libs/ardour/session_transport.cc
+++ b/libs/ardour/session_transport.cc
@@ -585,23 +585,16 @@ Session::non_realtime_locate ()
microseconds_t begin = get_microseconds ();
+ const framepos_t tf = _transport_frame;
+
{
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";
for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) {
- (*i)->non_realtime_locate (_transport_frame);
- 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;
- }
+ (*i)->non_realtime_locate (tf);
}
cerr << "\n\n <<< DONE Non-RT locate on routes\n\n";
@@ -610,7 +603,7 @@ Session::non_realtime_locate ()
{
VCAList v = _vca_manager->vcas ();
for (VCAList::const_iterator i = v.begin(); i != v.end(); ++i) {
- (*i)->non_realtime_locate (_transport_frame);
+ (*i)->non_realtime_locate (tf);
}
}