Refresh division views on timer.

Author: Archie3d

Source/PluginEditor.cpp

@@ -217,6 +217,7 @@ void AeolusAudioProcessorEditor::populateDivisions()
 void AeolusAudioProcessorEditor::refresh()
 {
     updateMeters();
+    updateDivisionViews();
     updateMidiKeyboardRange();
 }
 
@@ -238,3 +239,9 @@ void AeolusAudioProcessorEditor::updateMidiKeyboardRange()
     else
         _midiKeyboard.setPlayableRange(range.getStart(), range.getEnd());
 }
+
+void AeolusAudioProcessorEditor::updateDivisionViews()
+{
+    for (auto* dv : _divisionViews)
+        dv->update();
+}

Source/PluginEditor.h

@@ -53,6 +53,7 @@ class AeolusAudioProcessorEditor  : public juce::AudioProcessorEditor,
 
     void updateMeters();
     void updateMidiKeyboardRange();
+    void updateDivisionViews();
 
     AeolusAudioProcessor& _audioProcessor;
 

Source/aeolus/division.cpp

@@ -46,7 +46,6 @@ Division::Division(Engine& engine, const String& name)
     , _activeVoices{}
     , _triggerFlag{}
     , _volumeLevel{}
-    , _listeners{}
 {
     _swellFilterSpec.type = dsp::BiquadFilter::LowPass;
     _swellFilterSpec.sampleRate = SAMPLE_RATE;
@@ -208,17 +207,6 @@ void Division::setPersistentState(const juce::var& v)
     }
 }
 
-void Division::addListener(Listener* listener)
-{
-    jassert(listener != nullptr);
-    _listeners.add(listener);
-}
-
-void Division::removeListener(Listener* listener)
-{
-    _listeners.remove(listener);
-}
-
 void Division::populateLinkedDivisions()
 {
     _linkedDivisions.clear();
@@ -313,13 +301,7 @@ void Division::enableStop(int i, bool ena)
 {
     jassert(isPositiveAndBelow(i, _rankwaves.size()));
 
-    if (_rankwaves[i].enabled != ena) {
-        _rankwaves[i].enabled = ena;
-
-        _listeners.call([i](Listener& listener) {
-                listener.stopEnablementChanged(i);
-            });
-    }
+    _rankwaves[i].enabled = ena;
 }
 
 bool Division::isStopEnabled(int i) const
@@ -373,14 +355,8 @@ void Division::setTremulantEnabled(bool ena) noexcept
     if (!_hasTremulant)
         return;
 
-    if (_tremulantEnabled != ena) {
-        _tremulantEnabled = ena;
-        _tremulantTargetLevel = _tremulantEnabled ? _tremulantMaxLevel : 0.0f;
-
-        _listeners.call([](Listener& listener) {
-                listener.tremulantEnablementChanged();
-            });
-    }
+    _tremulantEnabled = ena;
+    _tremulantTargetLevel = _tremulantEnabled ? _tremulantMaxLevel : 0.0f;
 }
 
 float Division::getTremulantLevel(bool update)

Source/aeolus/division.h

@@ -84,15 +84,6 @@ class Division
         LevelMeter right;
     };
 
-    /// Listener for the division stop changes
-    class Listener
-    {
-    public:
-        virtual ~Listener() = default;
-        virtual void stopEnablementChanged(int stopIndex) {};
-        virtual void tremulantEnablementChanged() {};
-    };
-
     //--------------------------------------------------------------------------
 
     Division(Engine& engine, const juce::String& name = juce::String());
@@ -112,9 +103,6 @@ class Division
     juce::String getName() const { return _name; }
     juce::String getMnemonic() const { return _mnemonic; }
 
-    void addListener(Listener* listener);
-    void removeListener(Listener* listener);
-
     /**
      * Populate linked divisions from the division names.
      * This method must be called by the engine when all the divisions
@@ -233,8 +221,6 @@ class Division
 
     Level _volumeLevel;
 
-    juce::ListenerList<Listener> _listeners;
-
     JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(Division)
 };
 

Source/ui/DivisionControlPanel.cpp

@@ -72,13 +72,11 @@ DivisionControlPanel::DivisionControlPanel(aeolus::Division* division)
 
     _gainSlider.setSkewFactor(0.5f);
     addAndMakeVisible(_gainSlider);
-
-    _division->addListener(this);
 }
 
-DivisionControlPanel::~DivisionControlPanel()
+void DivisionControlPanel::update()
 {
-    _division->removeListener(this);
+    _tremulantButton.setToggleState(_division->isTremulantEnabled(), juce::dontSendNotification);
 }
 
 void DivisionControlPanel::resized()
@@ -108,12 +106,4 @@ void DivisionControlPanel::paint(juce::Graphics& g)
     g.fillRect(getLocalBounds());
 }
 
-void DivisionControlPanel::tremulantEnablementChanged()
-{
-    const bool ena = _division->isTremulantEnabled();
-    if (_tremulantButton.getToggleState() != ena) {
-        _tremulantButton.setToggleState(ena, juce::dontSendNotification);
-    }
-}
-
 } // namespace ui

Source/ui/DivisionControlPanel.h

@@ -26,20 +26,17 @@
 
 namespace ui {
 
-class DivisionControlPanel : public juce::Component,
-                             public aeolus::Division::Listener
+class DivisionControlPanel : public juce::Component
 {
 public:
     DivisionControlPanel(aeolus::Division* division = nullptr);
-    ~DivisionControlPanel();
+
+    void update();
 
     // juce::Component
     void resized() override;
     void paint(juce::Graphics& g) override;
 
-    // aeolus::Division::Listener
-    void tremulantEnablementChanged() override;
-
 private:
 
     aeolus::Division* _division;

Source/ui/DivisionView.cpp

@@ -55,6 +55,14 @@ DivisionView::DivisionView(aeolus::Division* division)
     populateLinkButtons();
 }
 
+void DivisionView::update()
+{
+    _controlPanel.update();
+
+    for (auto* b : _stopButtons)
+        b->update();
+}
+
 void DivisionView::cancelAllStops()
 {
     jassert(_division != nullptr);

Source/ui/DivisionView.h

@@ -33,6 +33,8 @@ class DivisionView : public juce::Component
 
     DivisionView(aeolus::Division* division = nullptr);
 
+    void update();
+
     void cancelAllStops();
     void cancelAllLinks();
     void cancelTremulant();

Source/ui/StopButton.cpp

@@ -38,21 +38,11 @@ StopButton::StopButton(aeolus::Division& division, int stopIndex)
     this->onClick = [this]() {
         _division.enableStop(_stopIndex, getToggleState());
     };
-
-    _division.addListener(this);
 }
 
-StopButton::~StopButton()
+void StopButton::update()
 {
-    _division.removeListener(this);
-}
-
-void StopButton::stopEnablementChanged(int stopIndex)
-{
-    // Update button state to reflect the stop state.
-    if (stopIndex == _stopIndex && getToggleState() != _stop.enabled) {
-        setToggleState(_stop.enabled, juce::dontSendNotification);
-    }
+    setToggleState(_division.isStopEnabled(_stopIndex), juce::dontSendNotification);
 }
 
 void StopButton::paintButton (Graphics& g, bool shouldDrawButtonAsHighlighted, bool shouldDrawButtonAsDown)

Source/ui/StopButton.h

@@ -27,16 +27,14 @@ namespace ui {
 /**
  * @brief Toggle button associated with a particular stop on a division.
  */
-class StopButton final : public juce::Button,
-                         public aeolus::Division::Listener
+class StopButton final : public juce::Button
 {
 public:
     StopButton(aeolus::Division& division, int stopIndex);
-    ~StopButton();
+
     void setMargin(int m) noexcept { _margin = m; }
 
-    // aeolus::Division::Listener
-    void stopEnablementChanged(int stopIndex) override;
+    void update();
 
 protected:
     // juce::Button