From 4d4f613be94854166dfed26d1246b106677a9391 Mon Sep 17 00:00:00 2001
From: Mike Oliphant <oliphant@nostatic.org>
Date: Wed, 27 May 2026 12:04:36 -0700
Subject: [PATCH] Update NeuralAudio. Switch to NeuralModelLoader. Work around
 NAM Core prewarm issues.

---
 deps/NeuralAudio   | 2 +-
 src/nam_plugin.cpp | 6 +++---
 src/nam_plugin.h   | 1 +
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/deps/NeuralAudio b/deps/NeuralAudio
index 2c6526f..570f0ce 160000
--- a/deps/NeuralAudio
+++ b/deps/NeuralAudio
@@ -1 +1 @@
-Subproject commit 2c6526f07bc327d4e32188b217ed4547621d8de5
+Subproject commit 570f0ceddf87f15fea2bec78563a94e1fe011578
diff --git a/src/nam_plugin.cpp b/src/nam_plugin.cpp
index 2632f25..fceab2a 100644
--- a/src/nam_plugin.cpp
+++ b/src/nam_plugin.cpp
@@ -128,7 +128,7 @@ namespace NAM {
 					{
 						lv2_log_trace(&nam->logger, "Staging model change: `%s`\n", msg->path);
 
-						model = NeuralAudio::NeuralModel::CreateFromFile(msg->path);
+						model = nam->loader.CreateFromFile(msg->path);
 					}
 
 					if (model != nullptr)
@@ -212,7 +212,7 @@ namespace NAM {
 	{
 		maxBufferSize = size;
 
-		NeuralAudio::NeuralModel::SetDefaultMaxAudioBufferSize(size);
+		loader.SetDefaultMaxAudioBufferSize(size);
 	}
 
 	void Plugin::process(uint32_t n_samples) noexcept
@@ -256,7 +256,7 @@ namespace NAM {
 		{
 			qualityScale = *(ports.quality_scale);
 
-			NeuralAudio::NeuralModel::SetDefaultQualityScaleFactor(qualityScale);
+			loader.SetDefaultQualityScaleFactor(qualityScale);
 
 			if (currentModel != nullptr)
 			{
diff --git a/src/nam_plugin.h b/src/nam_plugin.h
index 2a7644c..9a8a9ca 100644
--- a/src/nam_plugin.h
+++ b/src/nam_plugin.h
@@ -71,6 +71,7 @@ namespace NAM {
 		LV2_Log_Logger logger = {};
 		LV2_Worker_Schedule* schedule = nullptr;
 
+		NeuralAudio::NeuralModelLoader loader;
 		NeuralAudio::NeuralModel* currentModel = nullptr;
 		std::string currentModelPath;
 		float prevDCInput = 0;