#33 Add limiter checkbox.

Archie3d · Archie3d · commit ff69577186d9 · 2025-03-20T08:57:32.000Z
diff --git a/Source/Parameters.cpp b/Source/Parameters.cpp
@@ -31,6 +31,13 @@ Parameters::Parameters(AeolusAudioProcessor& proc)
     processor.addParameter(reverbWet = new AudioParameterFloat(ParameterID{"reverb_wet", 1}, "Reverb", 0.0f, 1.0f, 0.25f));
     processor.addParameter(volume = new AudioParameterFloat(ParameterID{"volume", 1}, "Volume", 0.0f, 1.0f, 0.5f));
 
+
+    auto onOffAttributes = AudioParameterBoolAttributes()
+                            .withStringFromValueFunction([] (auto x, auto) { return x ? "On" : "Off"; })
+                            .withLabel("enabled");
+
+    processor.addParameter(limiterEnabled = new AudioParameterBool(ParameterID{"limiter", 1}, "Limiter", false, onOffAttributes));
+
     auto& engine = proc.getEngine();
 
     for (int i = 0; i < engine.getDivisionCount(); ++i) {
diff --git a/Source/Parameters.h b/Source/Parameters.h
@@ -34,6 +34,8 @@ struct Parameters
 
     std::vector<juce::AudioParameterFloat*> divisionsGain;
 
+    juce::AudioParameterBool* limiterEnabled;
+
     Parameters(AeolusAudioProcessor& proc);
 
     juce::var toVar() const;
diff --git a/Source/PluginEditor.cpp b/Source/PluginEditor.cpp
@@ -73,17 +73,17 @@ AeolusAudioProcessorEditor::AeolusAudioProcessorEditor (AeolusAudioProcessor& p)
     setScaleFactor(1e-2f * _uiScalingPercent);
 
     addAndMakeVisible(_versionLabel);
-    _versionLabel.setFont (Font(Font::getDefaultMonospacedFontName(), 10, Font::plain));
+    _versionLabel.setFont(Font(FontOptions(Font::getDefaultMonospacedFontName(), 10, Font::plain)));
     _versionLabel.setJustificationType (Justification::right);
 
     addAndMakeVisible(_cpuLoadLabel);
-    _cpuLoadValueLabel.setFont (Font(Font::getDefaultMonospacedFontName(), 12, Font::plain));
+    _cpuLoadValueLabel.setFont(Font(FontOptions(Font::getDefaultMonospacedFontName(), 12, Font::plain)));
     _cpuLoadValueLabel.setJustificationType (Justification::right);
     _cpuLoadValueLabel.setColour(Label::textColourId, Colours::lightyellow);
     addAndMakeVisible(_cpuLoadValueLabel);
 
     addAndMakeVisible(_voiceCountLabel);
-    _voiceCountValueLabel.setFont (Font(Font::getDefaultMonospacedFontName(), 12, Font::plain));
+    _voiceCountValueLabel.setFont(Font(FontOptions(Font::getDefaultMonospacedFontName(), 12, Font::plain)));
     _voiceCountValueLabel.setJustificationType (Justification::right);
     _voiceCountValueLabel.setColour(Label::textColourId, Colours::lightyellow);
     addAndMakeVisible(_voiceCountValueLabel);
@@ -207,15 +207,20 @@ AeolusAudioProcessorEditor::AeolusAudioProcessorEditor (AeolusAudioProcessor& p)
     }
 
     _fxButton.onClick = [this] {
-        auto content = std::make_unique<ui::FxComponent>();
-        content->setSize(240, 220);
+        auto& params{ _audioProcessor.getParametersContainer() };
+        auto content = std::make_unique<ui::FxComponent>(params);
+        content->setSize(240, 120);
         auto* contentPtr = content.get();
+        bool limiterWasEnabled{ _audioProcessor.getParametersContainer().limiterEnabled->get() };
 
         auto& box = CallOutBox::launchAsynchronously(std::move(content), _fxButton.getBounds(), this);
-        contentPtr->onCancel = [&box] { box.dismiss(); };
-        contentPtr->onOk = [&box, contentPtr] {
-            // @todo Enable limiter and set its parameters
-            //_audioProcessor.getEngine().setReverbWet(contentPtr->getReverbWet());
+        contentPtr->onCancel = [&box, &params, limiterWasEnabled] {
+            // Return to the original state
+            (*params.limiterEnabled) = limiterWasEnabled;
+            box.dismiss();
+        };
+        contentPtr->onOk = [&box, &params, contentPtr] {
+            (*params.limiterEnabled) = contentPtr->isLimiterEnabled();
             box.dismiss();
         };
     };
diff --git a/Source/PluginProcessor.cpp b/Source/PluginProcessor.cpp
@@ -244,6 +244,7 @@ void AeolusAudioProcessor::processBlock(juce::AudioBuffer<float>& buffer, juce::
 
     _engine.setReverbWet(_parameters.reverbWet->get());
     _engine.setVolume(_parameters.volume->get());
+    _engine.enableLimiter(_parameters.limiterEnabled->get());
     _engine.process(outL, outR, buffer.getNumSamples(), isNonRealtime());
 
 #endif // AEOLUS_MULTIBUS_OUTPUT
diff --git a/Source/aeolus/engine.cpp b/Source/aeolus/engine.cpp
@@ -244,7 +244,6 @@ void EngineGlobal::setMTSEnabled(bool shouldBeEnabled)
 void EngineGlobal::setUIScalingFactor(float f)
 {
     _uiScalingFactor = jlimit(UI_SCALING_MIN, UI_SCALING_MAX, f);
-    DBG("SCALE: " << _uiScalingFactor);
     _listeners.call([&](Listener& listener){ listener.onUIScalingFactorChanged(_uiScalingFactor); });
 }
 
@@ -397,7 +396,7 @@ void EngineGlobal::loadIRs()
         std::unique_ptr<AudioFormatReader> reader{manager.createReaderFor(std::move(stream))};
         ir.waveform.setSize(reader->numChannels, (int)reader->lengthInSamples);
         const auto offset{ (juce::int64)ir.startOffset };
-        reader->read(&ir.waveform, 0, ir.waveform.getNumSamples() - offset, offset, true, true);
+        reader->read(&ir.waveform, 0, (int)(ir.waveform.getNumSamples() - offset), offset, true, true);
 
         ir.waveform.applyGain(ir.gain);
 
@@ -473,8 +472,8 @@ void Engine::prepareToPlay(float sampleRate, int frameSize)
     auto* g = EngineGlobal::getInstance();
     g->updateStops(SAMPLE_RATE_F);
 
-    _limiterSpec.threshold = 0.75f;
-    _limiterSpec.attack = 10000.0f / sampleRate;
+    _limiterSpec.threshold = 0.8f;
+    _limiterSpec.attack = 1000.0f / sampleRate;
     _limiterSpec.release = 1.0f / sampleRate;
     _limiterSpec.sustain = std::max(0, int(sampleRate * 0.5f));
 
@@ -533,6 +532,16 @@ void Engine::setVolume(float v)
     _params[VOLUME].setValue(v);
 }
 
+void Engine::enableLimiter(bool shouldBeEnabled)
+{
+    _limiterEnabled = shouldBeEnabled;
+}
+
+bool Engine::isLimiterEnabled() const
+{
+    return _limiterEnabled;
+}
+
 void Engine::process(float* outL, float* outR, int numFrames, bool isNonRealtime)
 {
     jassert(outL != nullptr);
@@ -592,8 +601,10 @@ void Engine::process(float* outL, float* outR, int numFrames, bool isNonRealtime
     applyVolume(origOutL, origOutR, origNumFrames);
 
     // Apply limiter
-    dsp::Limiter::process(_limiterSpec, _limiterState[0], origOutL, origOutL, origNumFrames);
-    dsp::Limiter::process(_limiterSpec, _limiterState[1], origOutR, origOutR, origNumFrames);
+    if (_limiterEnabled) {
+        dsp::Limiter::process(_limiterSpec, _limiterState[0], origOutL, origOutL, origNumFrames);
+        dsp::Limiter::process(_limiterSpec, _limiterState[1], origOutR, origOutR, origNumFrames);
+    }
 
     _volumeLevel.left.process(origOutL, origNumFrames);
     _volumeLevel.right.process(origOutR, origNumFrames);
diff --git a/Source/aeolus/engine.h b/Source/aeolus/engine.h
@@ -262,6 +262,16 @@ class Engine
      */
     Level& getVolumeLevel() noexcept { return _volumeLevel; }
 
+    /**
+     * Enable or disable master limiter.
+     */
+    void enableLimiter(bool shouldBeEnabled);
+
+    /**
+     * @return Whether the limiter is enabled.
+     */
+    bool isLimiterEnabled() const;
+
     /**
      * Returns currently set MIDI control channel.
      */
@@ -389,6 +399,7 @@ class Engine
     dsp::Limiter::Spec _limiterSpec;
     std::array<dsp::Limiter::State, aeolus::N_OUTPUT_CHANNELS> _limiterState;
     dsp::Limiter _limiter;
+    std::atomic<bool> _limiterEnabled{};
 
     dsp::Convolver _convolver;
     std::atomic<int> _selectedIR;
diff --git a/Source/ui/CustomLookAndFeel.cpp b/Source/ui/CustomLookAndFeel.cpp
@@ -26,16 +26,16 @@ namespace ui {
 const Font& CustomLookAndFeel::getStopButtonFont()
 {
 
-    static Font font(Typeface::createSystemTypefaceFor(BinaryData::WignersFriendRoman1GY8e_ttf,
-                                                       BinaryData::WignersFriendRoman1GY8e_ttfSize));
+    static Font font(FontOptions(Typeface::createSystemTypefaceFor(BinaryData::WignersFriendRoman1GY8e_ttf,
+                                                                   BinaryData::WignersFriendRoman1GY8e_ttfSize)));
 
     return font;
 }
 
 const Font& CustomLookAndFeel::getManualLabelFont()
 {
-    static Font font(Typeface::createSystemTypefaceFor(BinaryData::BalgrufJRye7_ttf,
-                                                       BinaryData::BalgrufJRye7_ttfSize));
+    static Font font(FontOptions(Typeface::createSystemTypefaceFor(BinaryData::BalgrufJRye7_ttf,
+                                                                   BinaryData::BalgrufJRye7_ttfSize)));
     return font;
 }
 
diff --git a/Source/ui/FxComponent.cpp b/Source/ui/FxComponent.cpp
@@ -25,8 +25,10 @@ using namespace juce;
 
 namespace ui {
 
-FxComponent::FxComponent()
-    : _fxLabel {{}, "Effects"}
+FxComponent::FxComponent(Parameters& params)
+    : _parameters{ params }
+    , _fxLabel {{}, "Effects"}
+    , _enableLimiterButton{"Enable master limiter"}
     , _okButton{"OK"}
     , _cancelButton{"Cancel"}
 {
@@ -39,6 +41,10 @@ FxComponent::FxComponent()
     font.setHeight(font.getHeight() * 1.2f);
     _fxLabel.setFont(font);
 
+    addAndMakeVisible(_enableLimiterButton);
+    _enableLimiterButton.onClick = [this] {
+        updateEnablement();
+    };
 
     addAndMakeVisible(_okButton);
     _okButton.onClick = [this] {
@@ -52,6 +58,8 @@ FxComponent::FxComponent()
 
     _cancelButton.setColour(TextButton::buttonColourId, Colour(0x66, 0x66, 0x33));
     _okButton.setColour(TextButton::buttonColourId, Colour(0x66, 0x66, 0x33));
+
+    captureState();
 }
 
 void FxComponent::resized()
@@ -66,12 +74,30 @@ void FxComponent::resized()
     bounds.removeFromTop(3 * margin);
 
     auto row = bounds.removeFromTop(20);
+    _enableLimiterButton.setBounds(row);
 
     row = bounds.removeFromBottom(20);
     _cancelButton.setBounds(row.removeFromRight(60));
     row.removeFromRight(margin);
     _okButton.setBounds(row.removeFromRight(60));
 }
 
+bool FxComponent::isLimiterEnabled() const
+{
+    return _enableLimiterButton.getToggleState();
+}
+
+void FxComponent::captureState()
+{
+    _enableLimiterButton.setToggleState(_parameters.limiterEnabled->get(), dontSendNotification);
+}
+
+void FxComponent::updateEnablement()
+{
+    // Update limiter enablement so that the effect can be heard immediately
+    (*_parameters.limiterEnabled) = _enableLimiterButton.getToggleState();
+
+    // Update UI component enablement depending on the current selection of the options
+}
 
 } // namespace ui
diff --git a/Source/ui/FxComponent.h b/Source/ui/FxComponent.h
@@ -21,6 +21,7 @@
 
 #include <functional>
 #include "aeolus/globals.h"
+#include "Parameters.h"
 
 namespace ui {
 
@@ -30,17 +31,26 @@ namespace ui {
 class FxComponent : public juce::Component
 {
 public:
-    FxComponent();
+    FxComponent(Parameters& engine);
 
     void resized() override;
 
+    bool isLimiterEnabled() const;
+
     std::function<void()> onOk{};
     std::function<void()> onCancel{};
 
 private:
 
+    void captureState();
+    void updateEnablement();
+
+    Parameters& _parameters;
+
     juce::Label _fxLabel;
 
+    juce::ToggleButton _enableLimiterButton;
+
     juce::TextButton _okButton;
     juce::TextButton _cancelButton;
 };

Original file line number	Diff line number	Diff line change
`@@ -26,16 +26,16 @@ namespace ui {`
`26`	`26`	`const Font& CustomLookAndFeel::getStopButtonFont()`
`27`	`27`	`{`
`28`	`28`
`29`		`- static Font font(Typeface::createSystemTypefaceFor(BinaryData::WignersFriendRoman1GY8e_ttf,`
`30`		`- BinaryData::WignersFriendRoman1GY8e_ttfSize));`
	`29`	`+ static Font font(FontOptions(Typeface::createSystemTypefaceFor(BinaryData::WignersFriendRoman1GY8e_ttf,`
	`30`	`+ BinaryData::WignersFriendRoman1GY8e_ttfSize)));`
`31`	`31`
`32`	`32`	`return font;`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`const Font& CustomLookAndFeel::getManualLabelFont()`
`36`	`36`	`{`
`37`		`- static Font font(Typeface::createSystemTypefaceFor(BinaryData::BalgrufJRye7_ttf,`
`38`		`- BinaryData::BalgrufJRye7_ttfSize));`
	`37`	`+ static Font font(FontOptions(Typeface::createSystemTypefaceFor(BinaryData::BalgrufJRye7_ttf,`
	`38`	`+ BinaryData::BalgrufJRye7_ttfSize)));`
`39`	`39`	`return font;`
`40`	`40`	`}`
`41`	`41`