summaryrefslogtreecommitdiff
path: root/libs/ardour/session_process.cc
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2017-07-05 17:24:02 -0400
committerPaul Davis <paul@linuxaudiosystems.com>2017-09-18 11:40:53 -0400
commit646d6bec7e3174644184e05a4b9da4501af53dd1 (patch)
treed828cea7db7bf1c0c9e5179b10f57c795182a0e3 /libs/ardour/session_process.cc
parentfb9dd1a411d518472521047b1f3451aabdc334a0 (diff)
when DiskReader checks to see if a locate is in progress, it must be atomic with respect to all DiskReaders
Diffstat (limited to 'libs/ardour/session_process.cc')
-rw-r--r--libs/ardour/session_process.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/libs/ardour/session_process.cc b/libs/ardour/session_process.cc
index c1230fc09e..19a6b64720 100644
--- a/libs/ardour/session_process.cc
+++ b/libs/ardour/session_process.cc
@@ -192,6 +192,8 @@ Session::process_routes (pframes_t nframes, bool& need_butler)
(*i)->automation_run (start_frame, nframes);
}
+ _global_locate_pending = locate_pending ();
+
if (_process_graph) {
DEBUG_TRACE(DEBUG::ProcessThreads,"calling graph/process-routes\n");
if (_process_graph->process_routes (nframes, start_frame, end_frame, declick, need_butler) < 0) {
@@ -243,6 +245,8 @@ Session::silent_process_routes (pframes_t nframes, bool& need_butler)
(*i)->automation_run (start_frame, nframes);
}
+ _global_locate_pending = locate_pending();
+
if (_process_graph) {
_process_graph->silent_process_routes (nframes, start_frame, end_frame, need_butler);
} else {