use enum values

vberthiaume · Jul 9, 2024 · 5aa09b4 · 5aa09b4
1 parent e444df1
commit 5aa09b4
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/source/DSP/GainedOscillator.h b/source/DSP/GainedOscillator.h
@@ -43,7 +43,7 @@ class GainedOscillator
         osc.setFrequency (newValue, force);
     }
 
-    void setOscShape (int newShape) { nextOsc.store (newShape); }
+    void setOscShape (OscShape::Values newShape) { nextOsc.store (newShape); }
 
     /**
      * @brief Sets the gain for the oscillator in the processorChain.
@@ -83,8 +83,7 @@ class GainedOscillator
         gainIndex
     };
 
-    //TODO: these need to be enums, I need to use proper enums instead of ints
-    std::atomic<int> currentOsc { OscShape::none }, nextOsc { { OscShape::saw } };
+    std::atomic<OscShape::Values> currentOsc { OscShape::none }, nextOsc { { OscShape::saw } };
 
     void updateOscillators();
 

diff --git a/source/DSP/PhatOscillators.h b/source/DSP/PhatOscillators.h
@@ -68,7 +68,7 @@ class PhatOscillators : public juce::AudioProcessorValueTreeState::Listener
     }
 
     void setOscFreq (OscId oscNum, int newMidiNote);
-    void setOscShape (OscId oscNum, int newShape);
+    void setOscShape (OscId oscNum, OscShape::Values newShape);
     void setOscTuning (OscId oscNum, float newTuning);
 
     void setOscSub (float newSub)
@@ -203,9 +203,9 @@ void PhatOscillators<T>::parameterChanged (const juce::String& parameterID, floa
     else if (parameterID == osc2TuningID.getParamID ())
         setOscTuning (OscId::osc2Index, newValue);
     else if (parameterID == osc1ShapeID.getParamID ())
-        setOscShape (OscId::osc1Index, (int) newValue);
+        setOscShape (OscId::osc1Index, static_cast<OscShape::Values> (newValue));
     else if (parameterID == osc2ShapeID.getParamID ())
-        setOscShape (OscId::osc2Index, (int) newValue);
+        setOscShape (OscId::osc2Index, static_cast<OscShape::Values> (newValue));
     else if (parameterID == oscSubID.getParamID ())
         setOscSub (newValue);
     else if (parameterID == oscMixID.getParamID ())
@@ -318,7 +318,7 @@ void PhatOscillators<T>::setOscFreq (OscId oscNum, int newMidiNote)
 }
 
 template <std::floating_point T>
-void PhatOscillators<T>::setOscShape (OscId oscNum, int newShape)
+void PhatOscillators<T>::setOscShape (OscId oscNum, OscShape::Values newShape)
 {
     switch (oscNum)
     {

diff --git a/source/Utility/Helpers.h b/source/Utility/Helpers.h
@@ -218,7 +218,7 @@ struct Selection
 
 struct OscShape : public Selection
 {
-    enum
+    enum Values
     {
         none = 0,
         saw,
-Original file line number
+Diff line change
@@ Expand Up / @@ -218,7 +218,7 @@ struct Selection @@
     struct OscShape : public Selection
     {
-        enum
+        enum Values
         {
             none = 0,
             saw,
@@ Expand Down @@