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/vmorpher.cpp | 18 +++++-------------
1 file changed, 5 insertions(+), 13 deletions(-)
(limited to 'al/effects/vmorpher.cpp')
diff --git a/al/effects/vmorpher.cpp b/al/effects/vmorpher.cpp
index 2ea2594e..3081201c 100644
--- a/al/effects/vmorpher.cpp
+++ b/al/effects/vmorpher.cpp
@@ -279,18 +279,13 @@ class EaxVocalMorpherEffect final :
public EaxEffect
{
public:
- EaxVocalMorpherEffect(
- EffectProps& al_effect_props);
-
+ EaxVocalMorpherEffect();
// [[nodiscard]]
bool dispatch(
const EaxEaxCall& eax_call) override;
-
private:
- EffectProps& al_effect_props_;
-
EAXVOCALMORPHERPROPERTIES eax_{};
EAXVOCALMORPHERPROPERTIES eax_d_{};
EaxVocalMorpherEffectDirtyFlags eax_dirty_flags_{};
@@ -407,10 +402,8 @@ public:
}; // EaxVocalMorpherEffectException
-EaxVocalMorpherEffect::EaxVocalMorpherEffect(
- EffectProps& al_effect_props)
- :
- al_effect_props_{al_effect_props}
+EaxVocalMorpherEffect::EaxVocalMorpherEffect()
+ : EaxEffect{AL_EFFECT_VOCAL_MORPHER}
{
set_eax_defaults();
set_efx_defaults();
@@ -860,10 +853,9 @@ bool EaxVocalMorpherEffect::set(
} // namespace
-EaxEffectUPtr eax_create_eax_vocal_morpher_effect(
- EffectProps& al_effect_props)
+EaxEffectUPtr eax_create_eax_vocal_morpher_effect()
{
- return std::make_unique<EaxVocalMorpherEffect>(al_effect_props);
+ return std::make_unique<EaxVocalMorpherEffect>();
}
#endif // ALSOFT_EAX
--
cgit v1.2.3