Unify initalization of EffectState members and fix e memory leak

mixxxdj · Mar 9, 2023 · b0bbe0e · b0bbe0e
1 parent 227148a
commit b0bbe0e
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 11 deletions.
diff --git a/src/effects/backends/builtin/autopaneffect.cpp b/src/effects/backends/builtin/autopaneffect.cpp
@@ -165,7 +165,8 @@ void AutoPanEffect::processChannel(
         pGroupState->frac.setWithRampingApplied(static_cast<float>((sinusoid + 1.0f) / 2.0f));
 
         // apply the delay
-        pGroupState->delay->process(&pInput[i],
+        pGroupState->pDelay->process(
+                &pInput[i],
                 &pOutput[i],
                 -0.005 *
                         math_clamp(

diff --git a/src/effects/backends/builtin/autopaneffect.h b/src/effects/backends/builtin/autopaneffect.h
@@ -64,16 +64,16 @@ static constexpr int panMaxDelay = 3300; // allows a 30 Hz filter at 97346;
 class AutoPanGroupState : public EffectState {
   public:
     AutoPanGroupState(const mixxx::EngineParameters& engineParameters)
-            : EffectState(engineParameters) {
-        time = 0;
-        delay = new EngineFilterPanSingle<panMaxDelay>();
-        m_dPreviousPeriod = -1.0;
+            : EffectState(engineParameters),
+              time(0),
+              pDelay(std::make_unique<EngineFilterPanSingle<panMaxDelay>>()),
+              m_dPreviousPeriod(-1.0) {
     }
     ~AutoPanGroupState() override = default;
 
     unsigned int time;
     RampedSample frac;
-    EngineFilterPanSingle<panMaxDelay>* delay;
+    std::unique_ptr<EngineFilterPanSingle<panMaxDelay>> pDelay;
     double m_dPreviousPeriod;
 };
 

diff --git a/src/effects/backends/builtin/bitcrushereffect.h b/src/effects/backends/builtin/bitcrushereffect.h
@@ -18,7 +18,8 @@ struct BitCrusherGroupState : public EffectState {
     }
     ~BitCrusherGroupState() override = default;
 
-    CSAMPLE hold_l, hold_r;
+    CSAMPLE hold_l;
+    CSAMPLE hold_r;
     // Accumulated fractions of a samplerate period.
     CSAMPLE accumulator;
 };

diff --git a/src/effects/backends/builtin/reverbeffect.h b/src/effects/backends/builtin/reverbeffect.h
@@ -31,7 +31,7 @@ class ReverbGroupState : public EffectState {
 
     float sampleRate;
     float sendPrevious;
-    MixxxPlateX2 reverb{};
+    MixxxPlateX2 reverb;
 };
 
 class ReverbEffect : public EffectProcessorImpl<ReverbGroupState> {

diff --git a/src/effects/backends/builtin/tremoloeffect.h b/src/effects/backends/builtin/tremoloeffect.h
@@ -10,13 +10,17 @@
 class TremoloState : public EffectState {
   public:
     TremoloState(const mixxx::EngineParameters& engineParameters)
-            : EffectState(engineParameters){};
+            : EffectState(engineParameters),
+              gain(0),
+              currentFrame(0),
+              quantizeEnabled(false),
+              tripletEnabled(false){};
     ~TremoloState() override = default;
 
     double gain;
     unsigned int currentFrame;
-    bool quantizeEnabled = false;
-    bool tripletEnabled = false;
+    bool quantizeEnabled;
+    bool tripletEnabled;
 };
 
 class TremoloEffect : public EffectProcessorImpl<TremoloState> {