summaryrefslogtreecommitdiff
path: root/libs/ardour/session_transport.cc
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2019-10-28 17:23:54 -0600
committerPaul Davis <paul@linuxaudiosystems.com>2019-10-28 17:23:54 -0600
commit7d3c2a4feee924ed4e12cd2048ae01a7db2e92a9 (patch)
tree2dd8542906ae6ae3637274550e9b3da64f310c3b /libs/ardour/session_transport.cc
parent706a9ab59f070024b50d4f504113eb57fc49d316 (diff)
provide a mechanism to decide if Session::update_latency_compensation() is being called as part of a callback from the backend.
If it is, do not call AudioEngine::update_latencies() to avoid JACK1-style deadlock
Diffstat (limited to 'libs/ardour/session_transport.cc')
-rw-r--r--libs/ardour/session_transport.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/ardour/session_transport.cc b/libs/ardour/session_transport.cc
index 6062b20518..317304eb11 100644
--- a/libs/ardour/session_transport.cc
+++ b/libs/ardour/session_transport.cc
@@ -1535,7 +1535,7 @@ Session::non_realtime_stop (bool abort, int on_entry, bool& finished)
(*i)->non_realtime_transport_stop (_transport_sample, !(ptw & PostTransportLocate));
}
- update_latency_compensation ();
+ update_latency_compensation (false, false);
}
/* If we are not synced to a "true" external master, and we're not
@@ -1920,7 +1920,7 @@ Session::route_processors_changed (RouteProcessorChange c)
}
resort_routes ();
- update_latency_compensation ();
+ update_latency_compensation (false, false);
set_dirty ();
}