NeuralAmpModelerPlugin

commit a1e959e9daa69b69f15dd8ceac006f2b85e75741
parent 8d0783734c80394749fd88296c7e1761659c7d5a
Author: Steven Atkinson <steven@atkinson.mn>
Date:   Mon,  4 Dec 2023 19:45:51 -0800

Add resampling info message (#399)


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

2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/NeuralAmpModeler/NeuralAmpModeler.cpp b/NeuralAmpModeler/NeuralAmpModeler.cpp
@@ -558,9 +558,7 @@ void NeuralAmpModeler::_CheckSampleRateWarning()
     if (_HaveModel())
     {
       const auto pluginSampleRate = GetSampleRate();
-      const auto namSampleRateFromModel = mModel->GetExpectedSampleRate();
-      // Any model with "-1" is probably 48k
-      const auto namSampleRate = namSampleRateFromModel == -1.0 ? 48000.0 : namSampleRateFromModel;
+      const auto namSampleRate = mModel->GetEncapsulatedSampleRate();
       control->SetSampleRate(namSampleRate);
       showWarning = pluginSampleRate != namSampleRate;
     }
diff --git a/NeuralAmpModeler/NeuralAmpModelerControls.h b/NeuralAmpModeler/NeuralAmpModelerControls.h
@@ -431,7 +431,7 @@ public:
   }
 };
 
-const IText _WARNING_TEXT(DEFAULT_TEXT_SIZE + 3.f, COLOR_RED, "Roboto-Regular", EAlign::Near);
+const IText _WARNING_TEXT(DEFAULT_TEXT_SIZE + 3.f, PluginColors::NAM_THEMECOLOR, "Roboto-Regular", EAlign::Near);
 
 class NAMSampleRateWarningControl : public ITextControl
 {
@@ -456,7 +456,7 @@ public:
   void SetSampleRate(const double sampleRate)
   {
     std::stringstream ss;
-    ss << "WARNING: NAM model expects sample rate " << static_cast<long>(std::round(sampleRate));
+    ss << "[INFO] Resampling to " << static_cast<long>(std::round(sampleRate)) << " Hz";
     SetStr(ss.str().c_str());
   }