From 7d3c2a4feee924ed4e12cd2048ae01a7db2e92a9 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Mon, 28 Oct 2019 17:23:54 -0600 Subject: 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 --- libs/ardour/session_process.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libs/ardour/session_process.cc') diff --git a/libs/ardour/session_process.cc b/libs/ardour/session_process.cc index 7633266d5a..13acece3db 100644 --- a/libs/ardour/session_process.cc +++ b/libs/ardour/session_process.cc @@ -536,7 +536,7 @@ Session::process_with_events (pframes_t nframes) if (this_event && this_event->action_sample <= end_sample && this_event->action_sample >= _transport_sample) { /* this isn't quite right for reverse play */ samples_moved = (samplecnt_t) (this_event->action_sample - _transport_sample); - DEBUG_TRACE (DEBUG::Transport, string_compose ("sub-loop2 plan to move transport by %1 (%2 @ %3)\n", samples_moved, nframes, _transport_speed)); + DEBUG_TRACE (DEBUG::Transport, string_compose ("sub-loop2 (for %4)plan to move transport by %1 (%2 @ %3)\n", samples_moved, nframes, _transport_speed, enum_2_string (this_event->type))); this_nframes = abs (floor(samples_moved / _transport_speed)); } -- cgit v1.2.3