NeuralAmpModelerPlugin

commit be127e9dde0397b42e48aff89807ce869a3ca0eb
parent c0c91c4f9e0d62438951f3a34eed830e65c2b890
Author: Steven Atkinson <steven@atkinson.mn>
Date:   Fri,  1 Dec 2023 21:26:29 -0600

Update core (#393)


Diffstat:
M
NeuralAmpModeler/NeuralAmpModeler.cpp
 | 
4
++--
M
NeuralAmpModeler/NeuralAmpModeler.h
 | 
4
++--

2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/NeuralAmpModeler/NeuralAmpModeler.cpp b/NeuralAmpModeler/NeuralAmpModeler.cpp
@@ -56,7 +56,7 @@ const IVStyle titleStyle =
 NeuralAmpModeler::NeuralAmpModeler(const InstanceInfo& info)
 : Plugin(info, MakeConfig(kNumParams, kNumPresets))
 {
-  activations::Activation::enable_fast_tanh();
+  nam::activations::Activation::enable_fast_tanh();
   GetParam(kInputLevel)->InitGain("Input", 0.0, -20.0, 20.0, 0.1);
   GetParam(kToneBass)->InitDouble("Bass", 5.0, 0.0, 10.0, 0.1);
   GetParam(kToneMid)->InitDouble("Middle", 5.0, 0.0, 10.0, 0.1);
@@ -645,7 +645,7 @@ std::string NeuralAmpModeler::_StageModel(const WDL_String& modelPath)
   try
   {
     auto dspPath = std::filesystem::u8path(modelPath.Get());
-    mStagedModel = get_dsp(dspPath);
+    mStagedModel = nam::get_dsp(dspPath);
     mNAMPath = modelPath;
     SendControlMsgFromDelegate(kCtrlTagModelFileBrowser, kMsgTagLoadedModel, mNAMPath.GetLength(), mNAMPath.Get());
   }
diff --git a/NeuralAmpModeler/NeuralAmpModeler.h b/NeuralAmpModeler/NeuralAmpModeler.h
@@ -151,11 +151,11 @@ private:
   dsp::noise_gate::Trigger mNoiseGateTrigger;
   dsp::noise_gate::Gain mNoiseGateGain;
   // The model actually being used:
-  std::unique_ptr<DSP> mModel;
+  std::unique_ptr<nam::DSP> mModel;
   // And the IR
   std::unique_ptr<dsp::ImpulseResponse> mIR;
   // Manages switching what DSP is being used.
-  std::unique_ptr<DSP> mStagedModel;
+  std::unique_ptr<nam::DSP> mStagedModel;
   std::unique_ptr<dsp::ImpulseResponse> mStagedIR;
   // Flags to take away the modules at a safe time.
   std::atomic<bool> mShouldRemoveModel = false;