Load model from state, don't overwrite params

jorshi · Mar 21, 2024 · 689bb81 · 689bb81
1 parent 832ae76
commit 689bb81
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 13 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,4 +1,8 @@
 {
     "cmake.configureOnOpen": true,
-    "cmake.cmakePath": "/opt/homebrew/bin/cmake"
+    "cmake.cmakePath": "/opt/homebrew/bin/cmake",
+    "files.associations": {
+        "*.m": "matlab",
+        "iosfwd": "cpp"
+    }
 }
diff --git a/source/PluginProcessor.cpp b/source/PluginProcessor.cpp
@@ -113,8 +113,9 @@ void TorchDrumProcessor::setStateInformation(const void* data,
         auto modelPath = preset.getChildWithName("ModelPath");
         if (modelPath.isValid())
         {
+            // Load the model, but don't overwrite the parameters
             std::string path = modelPath["Path"].toString().toStdString();
-            synthController.updateModel(path);
+            synthController.updateModel(path, false);
         }
     }
 }

diff --git a/source/SynthController.cpp b/source/SynthController.cpp
@@ -30,10 +30,6 @@ void SynthController::prepare(double sr, int samplesPerBlock)
     featureExtraction.prepare(sampleRate, ONSET_WINDOW_SIZE, ONSET_WINDOW_SIZE / 4);
     featureBuffer.clear();
     featureBuffer.setSize(1, ONSET_WINDOW_SIZE);
-
-    // Update synth parameters with the current patch
-    neuralMapper.getCurrentPatch(synth.getParameters().parameters);
-    synth.getParameters().updateAllParameters();
 }
 
 void SynthController::process(float x)
@@ -77,15 +73,18 @@ void SynthController::process(float x)
     }
 }
 
-void SynthController::updateModel(const std::string& path)
+void SynthController::updateModel(const std::string& path, bool updateParameters)
 {
     if (neuralMapper.loadModel(path))
     {
         modelPath = path;
 
-        // Update synth parameters with the current patch
-        neuralMapper.getCurrentPatch(synth.getParameters().parameters);
-        synth.getParameters().updateAllParameters();
+        // Update synth parameters with the preset stored in the model file
+        if (updateParameters)
+        {
+            neuralMapper.getCurrentPatch(synth.getParameters().parameters);
+            synth.getParameters().updateAllParameters();
+        }
     }
 }
 

diff --git a/source/SynthController.h b/source/SynthController.h
@@ -33,7 +33,7 @@ class SynthController
     void process(float x);
 
     // Update the neural network model
-    void updateModel(const std::string& path);
+    void updateModel(const std::string& path, bool updateParameters = true);
 
     // Getters for audio buffers
     const juce::AudioBuffer<float>& getBuffer() const { return buffer; }

diff --git a/source/Utils/NeuralNetworkMock.cpp b/source/Utils/NeuralNetworkMock.cpp
@@ -1,8 +1,9 @@
 #include "NeuralNetworkMock.h"
 
-void NeuralNetwork::loadModel(const std::string& path)
+bool NeuralNetwork::loadModel(const std::string& path)
 {
     modelLoaded = true;
+    return modelLoaded;
 }
 
 void NeuralNetwork::process(const std::vector<double>& input, std::vector<double>& output)

diff --git a/source/Utils/NeuralNetworkMock.h b/source/Utils/NeuralNetworkMock.h
@@ -14,7 +14,7 @@ class NeuralNetwork
     NeuralNetwork() = default;
     ~NeuralNetwork() = default;
 
-    void loadModel(const std::string& path);
+    bool loadModel(const std::string& path);
     void process(const std::vector<double>& input, std::vector<double>& output);
     void getCurrentPatch(std::vector<juce::RangedAudioParameter*> parameters) {}