fix: merge mistakes

Author: HessDavid

src/dmt/gui/display/OscilloscopeDisplay.h

@@ -70,8 +70,6 @@ class OscilloscopeDisplay
                       bool _useDefaultSettings = false)
     : apvts(_apvts)
     , ringBuffer(2, 4096)
-    : apvts(_apvts)
-    , ringBuffer(2, 4096)
     , fifoBuffer(_fifoBuffer)
     , leftOscilloscope(ringBuffer, 0, size)
     , rightOscilloscope(ringBuffer, 1, size)
@@ -92,21 +90,6 @@ class OscilloscopeDisplay
     }
   }
 
-  ~OscilloscopeDisplay() override
-  {
-    // Remove parameter listeners
-    if (!useDefaultSettings) {
-      // Assuming you have access to the AudioProcessorValueTreeState instance
-      // here, you would remove the listeners. This is just a placeholder.
-      apvts.removeParameterListener("OscilloscopeZoom", this);
-      apvts.removeParameterListener("OscilloscopeThickness", this);
-      apvts.removeParameterListener("OscilloscopeGain", this);
-    }
-
-    // Stop the repaint timer
-    stopRepaintTimer();
-  }
-
   ~OscilloscopeDisplay() override
   {
     // Remove parameter listeners
@@ -178,11 +161,10 @@ class OscilloscopeDisplay
                         rightBounds.getHeight());
 
     // Draw oscilloscope images
-    g.drawImageAt(leftOscilloscope.getFrontImage(),
     g.drawImageAt(leftOscilloscope.getFrontImage(),
                   leftOscilloscope.getBounds().getX(),
                   leftOscilloscope.getBounds().getY());
-    g.drawImageAt(rightOscilloscope.getFrontImage(),
+
     g.drawImageAt(rightOscilloscope.getFrontImage(),
                   rightOscilloscope.getBounds().getX(),
                   rightOscilloscope.getBounds().getY());
@@ -276,7 +258,6 @@ class OscilloscopeDisplay
   }
   //==============================================================================
 private:
-  AudioProcessorValueTreeState& apvts;
   AudioProcessorValueTreeState& apvts;
   RingAudioBuffer ringBuffer;
   FifoAudioBuffer& fifoBuffer;

src/dmt/gui/display/SettingsEditorDisplay.h

@@ -63,17 +63,16 @@ class SettingsEditorDisplay : public dmt::gui::display::AbstractDisplay
 
   ~SettingsEditorDisplay() override = default;
 
-  void extendResized(
-    const juce::Rectangle<int>& _displayBounds) noexcept override
+  void resized() noexcept override
   {
-    TRACER("SettingsEditorDisplay::extendResized");
+    TRACER("SettingsEditorDisplay::resized");
+    const auto bounds = getLocalBounds();
     const auto padding = rawPadding * size;
-    auto settingsBounds = _displayBounds.reduced(padding);
+    auto settingsBounds = bounds.reduced(padding);
     settingsEditor.setBounds(settingsBounds);
   }
 
-  void paintDisplay(juce::Graphics& /*_g*/,
-                    const juce::Rectangle<int>& /*_displayBounds*/) noexcept
+  void paintDisplay(juce::Graphics& /*_g*/) noexcept override
   {
     TRACER("SettingsEditorDisplay::paintDisplay");
     if (cachedPadding != rawPadding) {