NeuralAmpModelerPlugin

commit fbce0d60ca37021b08564bdd72d9589a200855cb
parent bd850f17e78cd2039bcd593550fe674d20c42401
Author: Oli Larkin <olilarkin@googlemail.com>
Date:   Sun,  7 May 2023 17:54:32 +0200

Rename all custom controls

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

2 files changed, 22 insertions(+), 23 deletions(-)
diff --git a/NeuralAmpModeler/NeuralAmpModeler.cpp b/NeuralAmpModeler/NeuralAmpModeler.cpp
@@ -225,11 +225,11 @@ NeuralAmpModeler::NeuralAmpModeler(const InstanceInfo& info)
                                                        fileSVG, closeButtonSVG, leftArrowSVG, rightArrowSVG), kCtrlTagIRFileBrowser);
 
     // TODO all these magic numbers
-    pGraphics->AttachControl(new NamSwitchControl(
+    pGraphics->AttachControl(new NAMSwitchControl(
       ngToggleArea.GetFromTop(60.f).GetPadded(-20.f), kNoiseGateActive, "", style, switchBitmap, switchHandleBitmap));
-    pGraphics->AttachControl(new NamSwitchControl(
+    pGraphics->AttachControl(new NAMSwitchControl(
       eqToggleArea.GetFromTop(60.f).GetPadded(-20.f), kEQActive, "", style, switchBitmap, switchHandleBitmap));
-    pGraphics->AttachControl(new NamSwitchControl(outNormToggleArea.GetFromTop(32.f).GetPadded(-20.f), kOutNorm, "",
+    pGraphics->AttachControl(new NAMSwitchControl(outNormToggleArea.GetFromTop(32.f).GetPadded(-20.f), kOutNorm, "",
                                                   style, switchBitmap, switchHandleBitmap),
                              kCtrlTagOutNorm);
     // Get those labels on
@@ -243,13 +243,12 @@ NeuralAmpModeler::NeuralAmpModeler(const InstanceInfo& info)
     }
 
     // The knobs
-    pGraphics->AttachControl(new NamKnobControl(inputKnobArea, kInputLevel, "", style, knobRotateBitmap));
-    pGraphics->AttachControl(new NamKnobControl(noiseGateArea, kNoiseGateThreshold, "", style, knobRotateBitmap));
-    pGraphics->AttachControl(new NamKnobControl(bassKnobArea, kToneBass, "", style, knobRotateBitmap), -1, "EQ_KNOBS");
-    pGraphics->AttachControl(new NamKnobControl(middleKnobArea, kToneMid, "", style, knobRotateBitmap), -1, "EQ_KNOBS");
-    pGraphics->AttachControl(
-      new NamKnobControl(trebleKnobArea, kToneTreble, "", style, knobRotateBitmap), -1, "EQ_KNOBS");
-    pGraphics->AttachControl(new NamKnobControl(outputKnobArea, kOutputLevel, "", style, knobRotateBitmap));
+    pGraphics->AttachControl(new NAMKnobControl(inputKnobArea, kInputLevel, "", style, knobRotateBitmap));
+    pGraphics->AttachControl(new NAMKnobControl(noiseGateArea, kNoiseGateThreshold, "", style, knobRotateBitmap));
+    pGraphics->AttachControl(new NAMKnobControl(bassKnobArea, kToneBass, "", style, knobRotateBitmap), -1, "EQ_KNOBS");
+    pGraphics->AttachControl(new NAMKnobControl(middleKnobArea, kToneMid, "", style, knobRotateBitmap), -1, "EQ_KNOBS");
+    pGraphics->AttachControl(new NAMKnobControl(trebleKnobArea, kToneTreble, "", style, knobRotateBitmap), -1, "EQ_KNOBS");
+    pGraphics->AttachControl(new NAMKnobControl(outputKnobArea, kOutputLevel, "", style, knobRotateBitmap));
 
     // toggle IR on / off
     pGraphics->AttachControl(new IBSwitchControl(irBypassToggleArea, irSwitchBitmap, kIRToggle));
@@ -277,7 +276,7 @@ NeuralAmpModeler::NeuralAmpModeler(const InstanceInfo& info)
       ->SetPeakSize(2.0f);
 
     //     Help/about box
-    pGraphics->AttachControl(new IRolloverCircleSVGButtonControl(
+    pGraphics->AttachControl(new NAMCircleButtonControl(
       mainArea.GetFromTRHC(50, 50).GetCentredInside(20, 20),
       [pGraphics](IControl* pCaller) {
         pGraphics->GetControlWithTag(kCtrlTagAboutBox)->As<IAboutBoxControl>()->HideAnimated(false);
diff --git a/NeuralAmpModeler/NeuralAmpModelerControls.h b/NeuralAmpModeler/NeuralAmpModelerControls.h
@@ -5,10 +5,10 @@
 using namespace iplug;
 using namespace igraphics;
 
-class IRolloverSVGButtonControl : public ISVGButtonControl
+class NAMSquareButtonControl : public ISVGButtonControl
 {
 public:
-  IRolloverSVGButtonControl(const IRECT& bounds, IActionFunction af, const ISVG& svg)
+  NAMSquareButtonControl(const IRECT& bounds, IActionFunction af, const ISVG& svg)
   : ISVGButtonControl(bounds, af, svg, svg)
   {
   }
@@ -22,10 +22,10 @@ public:
   }
 };
 
-class IRolloverCircleSVGButtonControl : public ISVGButtonControl
+class NAMCircleButtonControl : public ISVGButtonControl
 {
 public:
-  IRolloverCircleSVGButtonControl(const IRECT& bounds, IActionFunction af, const ISVG& svg)
+  NAMCircleButtonControl(const IRECT& bounds, IActionFunction af, const ISVG& svg)
   : ISVGButtonControl(bounds, af, svg, svg)
   {
   }
@@ -39,10 +39,10 @@ public:
   }
 };
 
-class NamKnobControl : public IVKnobControl, public IBitmapBase
+class NAMKnobControl : public IVKnobControl, public IBitmapBase
 {
 public:
-  NamKnobControl(const IRECT& bounds, int paramIdx, const char* label, const IVStyle& style, IBitmap bitmap)
+  NAMKnobControl(const IRECT& bounds, int paramIdx, const char* label, const IVStyle& style, IBitmap bitmap)
   : IVKnobControl(bounds, paramIdx, label, style, true)
   , IBitmapBase(bitmap)
   {
@@ -65,10 +65,10 @@ public:
   }
 };
 
-class NamSwitchControl : public IVSlideSwitchControl, public IBitmapBase
+class NAMSwitchControl : public IVSlideSwitchControl, public IBitmapBase
 {
 public:
-  NamSwitchControl(const IRECT& bounds, int paramIdx, const char* label, const IVStyle& style, IBitmap bitmap,
+  NAMSwitchControl(const IRECT& bounds, int paramIdx, const char* label, const IVStyle& style, IBitmap bitmap,
                    IBitmap handleBitmap)
   : IVSlideSwitchControl(
     {bounds.L, bounds.T, bitmap}, paramIdx, label, style.WithRoundness(5.f).WithShowLabel(false).WithShowValue(false))
@@ -236,15 +236,15 @@ public:
     const auto rightButtonBounds = padded.ReduceFromLeft(buttonWidth);
     const auto fileNameButtonBounds = padded;
     
-    AddChildControl(new IRolloverSVGButtonControl(loadFileButtonBounds, DefaultClickActionFunc, mLoadSVG))
+    AddChildControl(new NAMSquareButtonControl(loadFileButtonBounds, DefaultClickActionFunc, mLoadSVG))
     ->SetAnimationEndActionFunction(loadFileFunc);
-    AddChildControl(new IRolloverSVGButtonControl(leftButtonBounds, DefaultClickActionFunc, mLeftSVG))
+    AddChildControl(new NAMSquareButtonControl(leftButtonBounds, DefaultClickActionFunc, mLeftSVG))
     ->SetAnimationEndActionFunction(prevFileFunc);
-    AddChildControl(new IRolloverSVGButtonControl(rightButtonBounds, DefaultClickActionFunc, mRightSVG))
+    AddChildControl(new NAMSquareButtonControl(rightButtonBounds, DefaultClickActionFunc, mRightSVG))
     ->SetAnimationEndActionFunction(nextFileFunc);
     AddChildControl(mFileNameControl = new NAMFileNameControl(fileNameButtonBounds, mDefaultLabelStr.Get(), mStyle))
     ->SetAnimationEndActionFunction(chooseFileFunc);
-    AddChildControl(new IRolloverSVGButtonControl(clearButtonBounds, DefaultClickActionFunc, mClearSVG))
+    AddChildControl(new NAMSquareButtonControl(clearButtonBounds, DefaultClickActionFunc, mClearSVG))
     ->SetAnimationEndActionFunction(clearFileFunc);
     
     mFileNameControl->SetLabelAndTooltip(mDefaultLabelStr.Get());