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

1 files changed, 2 insertions, 2 deletions

diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h
index cb2e781ecf..2b56a1dccd 100644
--- a/libs/ardour/ardour/session.h
+++ b/libs/ardour/ardour/session.h
@@ -1238,7 +1238,7 @@ protected:
 	void set_sample_rate (samplecnt_t nframes);
 
 	friend class Route;
-	void update_latency_compensation (bool force = false);
+	void update_latency_compensation (bool force, bool called_from_backend);
 
 	/* transport API */
 
@@ -1401,7 +1401,7 @@ private:
 	boost::scoped_ptr<SessionDirectory> _session_dir;
 
 	void hookup_io ();
-	void graph_reordered ();
+	void graph_reordered (bool called_from_backend);
 
 	/** current snapshot name, without the .ardour suffix */
 	void set_snapshot_name (const std::string &);