From 0c507b5c621993206d94fc3776174eb96823f265 Mon Sep 17 00:00:00 2001 From: Chris Robinson 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/auxeffectslot.h | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) (limited to 'al/auxeffectslot.h') diff --git a/al/auxeffectslot.h b/al/auxeffectslot.h index 2c462cd0..8182c082 100644 --- a/al/auxeffectslot.h +++ b/al/auxeffectslot.h @@ -19,9 +19,8 @@ #ifdef ALSOFT_EAX #include -#include "al/effect.h" - #include "eax_eax_call.h" +#include "eax_effect.h" #include "eax_fx_slot_index.h" #endif // ALSOFT_EAX @@ -78,8 +77,6 @@ public: ALCcontext& al_context, EaxFxSlotIndexValue index); - void eax_uninitialize() noexcept; - const EAX50FXSLOTPROPERTIES& eax_get_eax_fx_slot() const noexcept; @@ -96,7 +93,7 @@ private: EAX50FXSLOTPROPERTIES eax_eax_fx_slot_{}; - EaxAlEffectUPtr eax_al_effect_{}; + EaxEffectUPtr eax_effect_{}; [[noreturn]] @@ -243,16 +240,13 @@ private: // `alAuxiliaryEffectSloti(effect_slot, AL_EFFECTSLOT_EFFECT, effect)` - void eax_set_effect_slot_effect( - ALeffect& effect); + void eax_set_effect_slot_effect(EaxEffect &effect); // `alAuxiliaryEffectSloti(effect_slot, AL_EFFECTSLOT_AUXILIARY_SEND_AUTO, value)` - void eax_set_effect_slot_send_auto( - bool is_send_auto); + void eax_set_effect_slot_send_auto(bool is_send_auto); // `alAuxiliaryEffectSlotf(effect_slot, AL_EFFECTSLOT_GAIN, gain)` - void eax_set_effect_slot_gain( - ALfloat gain); + void eax_set_effect_slot_gain(ALfloat gain); #endif // ALSOFT_EAX }; -- cgit v1.2.3