smoothed the gain slider and made the volume lower and frequency slider now works.

Author: khenderson20

source/Oscillator.cpp

@@ -10,6 +10,7 @@
 void Oscillator::prepare (double newSampleRate)
 {
     sampleRate = (newSampleRate > 0.0) ? newSampleRate : 44100.0;
+    gain.reset (sampleRate, 0.02);  // 20 ms ramp time
     reset();
 }
 
@@ -20,7 +21,7 @@ void Oscillator::setFrequency (float newFrequency)
 
 void Oscillator::setGain (float newGain)
 {
-    gain = std::max (0.0f, newGain);
+    gain.setTargetValue (std::max (0.0f, newGain));
 }
 
 void Oscillator::reset()
@@ -31,7 +32,7 @@ void Oscillator::reset()
 float Oscillator::getNextSineSample()
 {
     const float outputSample =
-        std::sin (phase * juce::MathConstants<float>::twoPi) * gain;
+        std::sin (phase * juce::MathConstants<float>::twoPi) * gain.getNextValue();
 
     phase += frequency / static_cast<float> (sampleRate);
     if (phase >= 1.0f)
@@ -42,7 +43,7 @@ float Oscillator::getNextSineSample()
 
 float Oscillator::getNextSawSample()
 {
-    const float outputSample = (2.0f * phase - 1.0f) * gain;
+    const float outputSample = (2.0f * phase - 1.0f) * gain.getNextValue();
 
     phase += frequency / static_cast<float> (sampleRate);
     if (phase >= 1.0f)

source/Oscillator.h

@@ -4,6 +4,8 @@
 
 #pragma once
 
+#include <juce_audio_basics/juce_audio_basics.h>
+
 class Oscillator
 {
 public:
@@ -18,5 +20,5 @@ class Oscillator
     double sampleRate = 44100.0;
     float phase = 0.0f;
     float frequency = 220.0f;
-    float gain = 0.15f;
+    juce::SmoothedValue<float> gain { 0.05f };
 };

source/PluginEditor.cpp

@@ -2,6 +2,29 @@
 
 #include <cmath>
 
+void PluginEditor::setupSlider (juce::Slider& slider,
+    juce::Label& label,
+    const juce::String& name,
+    double min, double max, double step, double initialValue,
+    std::function<void()> onChange,
+    double skewMidPoint)
+{
+    label.setText (name, juce::dontSendNotification);
+    label.attachToComponent (&slider, true);
+    addAndMakeVisible (label);
+
+    slider.setSliderStyle (juce::Slider::LinearHorizontal);
+    slider.setTextBoxStyle (juce::Slider::TextBoxRight, false, 80, 24);
+    slider.setRange (min, max, step);
+
+    if (skewMidPoint > 0.0)
+        slider.setSkewFactorFromMidPoint (skewMidPoint);
+
+    slider.setValue (initialValue);
+    slider.onValueChange = std::move (onChange);
+    addAndMakeVisible (slider);
+}
+
 PluginEditor::PluginEditor (PluginProcessor& p)
     : AudioProcessorEditor (&p), processorRef (p)
 {
@@ -18,37 +41,18 @@ PluginEditor::PluginEditor (PluginProcessor& p)
         inspector->setVisible (true);
     };
 
-    frequencyLabel.setText ("Frequency", juce::dontSendNotification);
-    frequencyLabel.attachToComponent (&frequencySlider, false);
-    addAndMakeVisible (frequencyLabel);
+    // --- Frequency slider ---
+    setupSlider (frequencySlider, frequencyLabel, "Frequency",
+                 20.0, 2000.0, 0.01, processorRef.getFrequency(),
+                 [this] { processorRef.setFrequency (static_cast<float> (frequencySlider.getValue())); repaint(); },
+                 220.0);
 
-    frequencySlider.setSliderStyle (juce::Slider::LinearHorizontal);
-    frequencySlider.setTextBoxStyle (juce::Slider::TextBoxRight, false, 80, 24);
-    frequencySlider.setRange (20.0, 2000.0, 0.01);
-    frequencySlider.setSkewFactorFromMidPoint (220.0);
-    frequencySlider.setValue (processorRef.getFrequency());
-    frequencySlider.onValueChange = [this]
-    {
-        processorRef.setFrequency (static_cast<float> (frequencySlider.getValue()));
-        repaint();
-    };
-    addAndMakeVisible (frequencySlider);
-
-    gainLabel.setText ("Gain", juce::dontSendNotification);
-    gainLabel.attachToComponent (&gainSlider, false);
-    addAndMakeVisible (gainLabel);
-
-    gainSlider.setSliderStyle (juce::Slider::LinearHorizontal);
-    gainSlider.setTextBoxStyle (juce::Slider::TextBoxRight, false, 80, 24);
-    gainSlider.setRange (0.0, 1.0, 0.001);
-    gainSlider.setValue (processorRef.getGain());
-    gainSlider.onValueChange = [this]
-    {
-        processorRef.setGain (static_cast<float> (gainSlider.getValue()));
-        repaint();
-    };
-    addAndMakeVisible (gainSlider);
+    // --- Gain slider ---
+    setupSlider (gainSlider, gainLabel, "Gain",
+                 0.0, 1.0, 0.001, processorRef.getGain(),
+                 [this] { processorRef.setGain (static_cast<float> (gainSlider.getValue())); repaint(); });
 
+    // --- Waveform selector ---
     waveformLabel.setText ("Waveform", juce::dontSendNotification);
     addAndMakeVisible (waveformLabel);
 
@@ -57,11 +61,9 @@ PluginEditor::PluginEditor (PluginProcessor& p)
     waveformBox.setSelectedId (processorRef.getWaveform() == PluginProcessor::Waveform::sine ? 1 : 2);
     waveformBox.onChange = [this]
     {
-        const auto selectedWaveform = waveformBox.getSelectedId() == 1
+        processorRef.setWaveform (waveformBox.getSelectedId() == 1
             ? PluginProcessor::Waveform::sine
-            : PluginProcessor::Waveform::saw;
-
-        processorRef.setWaveform (selectedWaveform);
+            : PluginProcessor::Waveform::saw);
         repaint();
     };
     addAndMakeVisible (waveformBox);
@@ -70,8 +72,7 @@ PluginEditor::PluginEditor (PluginProcessor& p)
 }
 
 PluginEditor::~PluginEditor()
-{
-}
+= default;
 
 void PluginEditor::paint (juce::Graphics& g)
 {
@@ -120,26 +121,27 @@ void PluginEditor::resized()
     inspectButton.setBounds (getLocalBounds().reduced (16).removeFromBottom (40).removeFromRight (140));
 }
 
-void PluginEditor::drawWaveformPreview (juce::Graphics& g, juce::Rectangle<int> area)
+void PluginEditor::drawWaveformBackground (juce::Graphics& g, const juce::Rectangle<int> area)
 {
+    const auto areaF = area.toFloat();
+
     g.setColour (juce::Colour (0xff2a2a2a));
-    g.fillRoundedRectangle (area.toFloat(), 8.0f);
+    g.fillRoundedRectangle (areaF, 8.0f);
 
     g.setColour (juce::Colour (0xff404040));
-    g.drawRoundedRectangle (area.toFloat(), 8.0f, 1.0f);
-
-    const auto left = static_cast<float> (area.getX());
-    const auto right = static_cast<float> (area.getRight());
-    const auto top = static_cast<float> (area.getY());
-    const auto bottom = static_cast<float> (area.getBottom());
-    const auto width = static_cast<float> (area.getWidth());
-    const auto centreY = static_cast<float> (area.getCentreY());
-    const auto amplitude = static_cast<float> (area.getHeight()) * 0.35f * processorRef.getGain();
+    g.drawRoundedRectangle (areaF, 8.0f, 1.0f);
 
     g.setColour (juce::Colour (0xff555555));
-    g.drawHorizontalLine (area.getCentreY(), left, right);
+    g.drawHorizontalLine (area.getCentreY(),
+        static_cast<float> (area.getX()),
+        static_cast<float> (area.getRight()));
+}
 
+juce::Path PluginEditor::buildWaveformPath (const juce::Rectangle<int> area, float amplitude) const
+{
     juce::Path path;
+    const auto width = static_cast<float> (area.getWidth());
+    const auto centreY = static_cast<float> (area.getCentreY());
 
     for (int x = 0; x < area.getWidth(); ++x)
     {
@@ -158,22 +160,36 @@ void PluginEditor::drawWaveformPreview (juce::Graphics& g, juce::Rectangle<int>
         }
 
         const float y = centreY - (sample * amplitude);
-        const float drawX = static_cast<float> (area.getX() + x);
+        const auto drawX = static_cast<float> (area.getX() + x);
 
         if (x == 0)
             path.startNewSubPath (drawX, y);
         else
             path.lineTo (drawX, y);
     }
 
-    g.setColour (juce::Colours::cyan);
-    g.strokePath (path, juce::PathStrokeType (2.0f));
+    return path;
+}
 
+void PluginEditor::drawWaveformInfoText (juce::Graphics& g, const juce::Rectangle<int> area) const
+{
     g.setColour (juce::Colours::lightgreen);
     g.setFont (13.0f);
     g.drawText (
-        "Freq: " + juce::String (processorRef.getFrequency(), 1) + " Hz    Gain: " + juce::String (processorRef.getGain(), 2),
+        "Freq: " + juce::String (processorRef.getFrequency(), 1)
+            + " Hz    Gain: " + juce::String (processorRef.getGain(), 2),
         area.reduced (10).removeFromBottom (24),
         juce::Justification::centredLeft,
         false);
+}
+
+void PluginEditor::drawWaveformPreview (juce::Graphics& g, const juce::Rectangle<int> area) const
+{
+    drawWaveformBackground (g, area);
+
+    const float amplitude = static_cast<float> (area.getHeight()) * 0.35f * processorRef.getGain();
+    g.setColour (juce::Colours::cyan);
+    g.strokePath (buildWaveformPath (area, amplitude), juce::PathStrokeType (2.0f));
+
+    drawWaveformInfoText (g, area);
 }

source/PluginEditor.h

@@ -16,7 +16,16 @@ class PluginEditor : public juce::AudioProcessorEditor
     void resized() override;
 
 private:
-    void drawWaveformPreview (juce::Graphics& g, juce::Rectangle<int> area);
+    void setupSlider (juce::Slider& slider, juce::Label& label,
+        const juce::String& name, double min, double max,
+        double step, double initialValue,
+        std::function<void()> onChange,
+        double skewMidPoint = 0.0);
+
+    void drawWaveformPreview (juce::Graphics& g, juce::Rectangle<int> area) const;
+    static void drawWaveformBackground (juce::Graphics& g, juce::Rectangle<int> area);
+    juce::Path buildWaveformPath (juce::Rectangle<int> area, float amplitude) const;
+    void drawWaveformInfoText (juce::Graphics& g, juce::Rectangle<int> area) const;
 
     PluginProcessor& processorRef;
     std::unique_ptr<melatonin::Inspector> inspector;

source/PluginProcessor.h

@@ -56,7 +56,7 @@ class PluginProcessor : public juce::AudioProcessor
 private:
     Oscillator oscillator;
     float frequency = 220.0f;
-    float gain = 0.15f;
+    float gain = 0.05f;
     Waveform waveform = Waveform::saw;
 
     JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (PluginProcessor)