From ae01dafccef00c891063f0e0cdb6fa9b3262325b Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Sun, 29 Nov 2020 12:50:51 -0700
Subject: [PATCH] use Temporal::set_thread_sample_rate() rather than explicit
 assignment

---
 gtk2_ardour/ardour_ui.cc           | 6 ++----
 gtk2_ardour/editor_audio_import.cc | 2 +-
 libs/ardour/audioengine.cc         | 6 +++++-
 libs/ardour/graph.cc               | 6 +++++-
 libs/ardour/session_process.cc     | 2 +-
 5 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index 93c3c4b345..7b46975cc1 100644
--- a/gtk2_ardour/ardour_ui.cc
+++ b/gtk2_ardour/ardour_ui.cc
@@ -3117,11 +3117,9 @@ ARDOUR_UI::setup_toplevel_window (Gtk::Window& window, const string& name, void*
 void
 ARDOUR_UI::event_loop_precall ()
 {
-	std::cout << "ev precall\n";
-
 	if (_session) {
-		Temporal::_thread_sample_rate = _session->sample_rate ();
+		Temporal::set_thread_sample_rate (_session->sample_rate ());
 	} else {
-		Temporal::_thread_sample_rate = 44100;
+		Temporal::set_thread_sample_rate (44100);
 	}
 }
diff --git a/gtk2_ardour/editor_audio_import.cc b/gtk2_ardour/editor_audio_import.cc
index c702f18919..4b7f421429 100644
--- a/gtk2_ardour/editor_audio_import.cc
+++ b/gtk2_ardour/editor_audio_import.cc
@@ -1142,7 +1142,7 @@ Editor::_import_thread (void *arg)
 void *
 Editor::import_thread ()
 {
-	Temporal::_thread_sample_rate = _session->sample_rate();
+	Temporal::set_thread_sample_rate (_session->sample_rate());
 	Temporal::TempoMap::fetch ();
 
 	_session->import_files (import_status);
diff --git a/libs/ardour/audioengine.cc b/libs/ardour/audioengine.cc
index 3d9ef510d0..b870eb765d 100644
--- a/libs/ardour/audioengine.cc
+++ b/libs/ardour/audioengine.cc
@@ -288,6 +288,10 @@ AudioEngine::process_callback (pframes_t nframes)
 		thread_init_callback (NULL);
 	}
 
+#warning NUTEMPO session sample rate or backend sample rate?
+	Temporal::set_thread_sample_rate (sample_rate());
+	Temporal::TempoMap::fetch ();
+
 	/* This is for JACK, where the latency callback arrives in sync with
 	 * port registration (usually while ardour holds the process-lock
 	 * or with _adding_routes_in_progress or _route_deletion_in_progress set,
@@ -1429,7 +1433,7 @@ AudioEngine::thread_init_callback (void* arg)
 	PBD::notify_event_loops_about_thread_creation (pthread_self(), thread_name, 4096);
 	AsyncMIDIPort::set_process_thread (pthread_self());
 
-	Temporal::_thread_sample_rate = 44100; /* will change later as appropriate */
+	Temporal::set_thread_sample_rate (44100); /* will change later as appropriate */
 	Temporal::TempoMap::fetch ();
 
 	if (arg) {
diff --git a/libs/ardour/graph.cc b/libs/ardour/graph.cc
index 5a08e2c787..1012c1b87a 100644
--- a/libs/ardour/graph.cc
+++ b/libs/ardour/graph.cc
@@ -23,6 +23,9 @@
 #include <cmath>
 #include <stdio.h>
 
+#include <sys/syscall.h>
+#include <sys/types.h>
+
 #include "pbd/compose.h"
 #include "pbd/debug_rt_alloc.h"
 #include "pbd/pthread_utils.h"
@@ -470,6 +473,7 @@ Graph::helper_thread ()
 	pt->get_buffers ();
 
 	while (!g_atomic_int_get (&_terminate)) {
+		// printf ("HELPER %s %ld\n",  pthread_name(), syscall (SYS_gettid)); fflush (stdout);
 		setup_thread_local_variables ();
 		run_one ();
 	}
@@ -535,7 +539,7 @@ again:
 void
 Graph::setup_thread_local_variables ()
 {
-	Temporal::_thread_sample_rate = _session.sample_rate ();
+	Temporal::set_thread_sample_rate (_session.sample_rate ());
 	Temporal::TempoMap::fetch ();
 }
 
diff --git a/libs/ardour/session_process.cc b/libs/ardour/session_process.cc
index 9485143e55..3631d568fa 100644
--- a/libs/ardour/session_process.cc
+++ b/libs/ardour/session_process.cc
@@ -72,7 +72,7 @@ using namespace std;
 void
 Session::setup_thread_local_variables ()
 {
-	Temporal::_thread_sample_rate = sample_rate();
+	Temporal::set_thread_sample_rate (sample_rate());
 }
 
 /** Called by the audio engine when there is work to be done with JACK.