From 0c507b5c621993206d94fc3776174eb96823f265 Mon Sep 17 00:00:00 2001
From: Chris Robinson <chris.kcat@gmail.com>
Date: Mon, 7 Feb 2022 10:17:13 -0800
Subject: Avoid using ALeffect to manage EaxEffect objects

Effect slots can just use its EaxEffect directly.
---
 al/effects/modulator.cpp | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

(limited to 'al/effects/modulator.cpp')

diff --git a/al/effects/modulator.cpp b/al/effects/modulator.cpp
index c33db8c3..ec7520e2 100644
--- a/al/effects/modulator.cpp
+++ b/al/effects/modulator.cpp
@@ -163,8 +163,7 @@ class EaxRingModulatorEffect final :
     public EaxEffect
 {
 public:
-    EaxRingModulatorEffect(
-        EffectProps& al_effect_props);
+    EaxRingModulatorEffect();
 
 
     // [[nodiscard]]
@@ -173,8 +172,6 @@ public:
 
 
 private:
-    EffectProps& al_effect_props_;
-
     EAXRINGMODULATORPROPERTIES eax_{};
     EAXRINGMODULATORPROPERTIES eax_d_{};
     EaxRingModulatorEffectDirtyFlags eax_dirty_flags_{};
@@ -258,10 +255,8 @@ public:
 }; // EaxRingModulatorEffectException
 
 
-EaxRingModulatorEffect::EaxRingModulatorEffect(
-    EffectProps& al_effect_props)
-    :
-    al_effect_props_{al_effect_props}
+EaxRingModulatorEffect::EaxRingModulatorEffect()
+    : EaxEffect{AL_EFFECT_RING_MODULATOR}
 {
     set_eax_defaults();
     set_efx_defaults();
@@ -533,10 +528,9 @@ bool EaxRingModulatorEffect::set(
 
 } // namespace
 
-EaxEffectUPtr eax_create_eax_ring_modulator_effect(
-    EffectProps& al_effect_props)
+EaxEffectUPtr eax_create_eax_ring_modulator_effect()
 {
-    return std::make_unique<EaxRingModulatorEffect>(al_effect_props);
+    return std::make_unique<EaxRingModulatorEffect>();
 }
 
 #endif // ALSOFT_EAX
-- 
cgit v1.2.3