diff options
author | Chris Robinson <[email protected]> | 2022-02-07 10:17:13 -0800 |
---|---|---|
committer | Chris Robinson <[email protected]> | 2022-02-07 10:17:13 -0800 |
commit | 0c507b5c621993206d94fc3776174eb96823f265 (patch) | |
tree | 27ce2550c88fb9f73145fd8be2298850814985bc /al/effect.h | |
parent | b09aab8426b0feb74cacb8704b4953b3b56a8c30 (diff) |
Avoid using ALeffect to manage EaxEffect objects
Effect slots can just use its EaxEffect directly.
Diffstat (limited to 'al/effect.h')
-rw-r--r-- | al/effect.h | 52 |
1 files changed, 1 insertions, 51 deletions
diff --git a/al/effect.h b/al/effect.h index 0e4948f7..a1d43313 100644 --- a/al/effect.h +++ b/al/effect.h @@ -7,12 +7,6 @@ #include "al/effects/effects.h" #include "alc/effects/base.h" -#ifdef ALSOFT_EAX -#include <memory> - -#include "eax_effect.h" -#endif // ALSOFT_EAX - enum { EAXREVERB_EFFECT = 0, @@ -57,56 +51,12 @@ struct ALeffect { ALuint id{0u}; DISABLE_ALLOC() - - -#ifdef ALSOFT_EAX -public: - EaxEffectUPtr eax_effect{}; - - - void eax_initialize(); - - void eax_al_set_effect( - ALenum al_effect_type); - - -private: - [[noreturn]] - static void eax_fail( - const char* message); -#endif // ALSOFT_EAX }; void InitEffect(ALeffect *effect); void LoadReverbPreset(const char *name, ALeffect *effect); -#ifdef ALSOFT_EAX -class EaxAlEffectDeleter { -public: - EaxAlEffectDeleter() noexcept = default; - - EaxAlEffectDeleter( - ALCcontext& context) noexcept; - - void operator()( - ALeffect* effect) const; - - -private: - ALCcontext* context_{}; -}; // EaxAlEffectDeleter - -using EaxAlEffectUPtr = std::unique_ptr<ALeffect, EaxAlEffectDeleter>; - - -EaxAlEffectUPtr eax_create_al_effect( - ALCcontext& context, - ALenum effect_type); - -void eax_al_delete_effect( - ALCcontext& context, - ALeffect& effect); -#endif // ALSOFT_EAX +bool IsValidEffectType(ALenum type) noexcept; #endif |