NeuralAmpModelerPlugin

commit 422c4d91fbed920cc6391ba8caa3d0620d64b40b
parent 045b5891f366a658cc8c83d48a9fac04cc6b158d
Author: Steven Atkinson <steven@atkinson.mn>
Date:   Sun,  2 Jul 2023 15:27:13 -0700

Merge branch 'rework-bitmap-controls' of https://github.com/olilarkin/NeuralAmpModelerPlugin into rework-bitmap-controls

Diffstat:
M
NeuralAmpModeler/NeuralAmpModeler.cpp
 | 
6
+++---
M
NeuralAmpModeler/NeuralAmpModeler.h
 | 
11
+++++++++--
M
NeuralAmpModeler/NeuralAmpModelerControls.h
 | 
4
++--
M
NeuralAmpModeler/config.h
 | 
2
+-
A
NeuralAmpModeler/resources/fonts/Michroma-Regular.ttf
 | 
0

5 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/NeuralAmpModeler/NeuralAmpModeler.cpp b/NeuralAmpModeler/NeuralAmpModeler.cpp
@@ -50,7 +50,7 @@ const IVStyle style =
 
 const IVStyle titleStyle =
 DEFAULT_STYLE
-.WithValueText(IText(24, COLOR_WHITE, "Ronduit-Light"))
+.WithValueText(IText(30, COLOR_WHITE, "Michroma-Regular"))
 .WithDrawFrame(false)
 .WithShadowOffset(2.f);
 
@@ -89,7 +89,7 @@ NeuralAmpModeler::NeuralAmpModeler(const InstanceInfo& info)
     pGraphics->EnableTooltips(true);
     
     pGraphics->LoadFont("Roboto-Regular", ROBOTO_FN);
-    pGraphics->LoadFont("Ronduit-Light", RONDUIT_FN);
+    pGraphics->LoadFont("Michroma-Regular", MICHROMA_FN);
     
     const auto helpSVG = pGraphics->LoadSVG(HELP_FN);
     const auto fileSVG = pGraphics->LoadSVG(FILE_FN);
@@ -193,7 +193,7 @@ NeuralAmpModeler::NeuralAmpModeler(const InstanceInfo& info)
 
     pGraphics->AttachBackground(BACKGROUND_FN);
     pGraphics->AttachControl(new IBitmapControl(b, linesBitmap));
-    pGraphics->AttachControl(new IVLabelControl(titleArea, "Neural Amp Modeler", titleStyle));
+    pGraphics->AttachControl(new IVLabelControl(titleArea, "NEURAL AMP MODELER", titleStyle));
     pGraphics->AttachControl(new ISVGControl(modelIconArea, modelIconSVG));
 
 #ifdef NAM_PICK_DIRECTORY
diff --git a/NeuralAmpModeler/NeuralAmpModeler.h b/NeuralAmpModeler/NeuralAmpModeler.h
@@ -14,6 +14,14 @@ const int kNumPresets = 1;
 // The plugin is mono inside
 constexpr size_t kNumChannelsInternal = 1;
 
+class NAMSender : public iplug::IPeakAvgSender<>
+{
+public:
+  NAMSender()
+  : iplug::IPeakAvgSender<>(-90.0, true, 5.0f, 1.0f, 300.0f, 500.0f)
+  {
+  }
+};
 
 enum EParams
 {
@@ -161,6 +169,5 @@ private:
 
   std::unordered_map<std::string, double> mNAMParams = {{"Input", 0.0}, {"Output", 0.0}};
 
-  iplug::IPeakAvgSender<> mInputSender {-90.0, true, 5.0f, 1.0f, 300.0f, 500.0f};
-  iplug::IPeakAvgSender<> mOutputSender {-90.0, true, 5.0f, 1.0f, 300.0f, 500.0f};
+  NAMSender mInputSender, mOutputSender;
 };
diff --git a/NeuralAmpModeler/NeuralAmpModelerControls.h b/NeuralAmpModeler/NeuralAmpModelerControls.h
@@ -507,11 +507,11 @@ public:
 
     const IVStyle titleStyle =
     DEFAULT_STYLE
-    .WithValueText(IText(24, COLOR_WHITE, "Ronduit-Light"))
+    .WithValueText(IText(30, COLOR_WHITE, "Michroma-Regular"))
     .WithDrawFrame(false)
     .WithShadowOffset(2.f);
     
-    AddChildControl(new IVLabelControl(IRECT(), "Neural Amp Modeler", titleStyle));
+    AddChildControl(new IVLabelControl(IRECT(), "NEURAL AMP MODELER", titleStyle));
 
     WDL_String verStr, buildInfoStr;
     PLUG()->GetPluginVersionStr(verStr);
diff --git a/NeuralAmpModeler/config.h b/NeuralAmpModeler/config.h
@@ -57,7 +57,7 @@
 #define APP_SIGNAL_VECTOR_SIZE 64
 
 #define ROBOTO_FN "Roboto-Regular.ttf"
-#define RONDUIT_FN "RonduitCapitals-Light.ttf"
+#define MICHROMA_FN "Michroma-Regular.ttf"
 
 #define HELP_FN "Help.svg"
 #define FILE_FN "File.svg"
diff --git a/NeuralAmpModeler/resources/fonts/Michroma-Regular.ttf b/NeuralAmpModeler/resources/fonts/Michroma-Regular.ttf
Binary files differ.