diff options
| -rw-r--r-- | alc/alc.cpp | 5 | ||||
| -rw-r--r-- | alc/context.cpp | 18 | ||||
| -rw-r--r-- | alc/context.h | 4 |
3 files changed, 6 insertions, 21 deletions
diff --git a/alc/alc.cpp b/alc/alc.cpp index 3af6f8ec..82e31667 100644 --- a/alc/alc.cpp +++ b/alc/alc.cpp @@ -1277,6 +1277,11 @@ void alc_initconfig(void) { eax_g_is_enabled = true; } + if(eax_g_is_enabled && DisabledEffects[EAXREVERB_EFFECT]) + { + eax_g_is_enabled = false; + TRACE("%s\n", "EAX disabled because EAXReverb is disabled."); + } } #endif // ALSOFT_EAX } diff --git a/alc/context.cpp b/alc/context.cpp index 2d783ca4..a1b2fc36 100644 --- a/alc/context.cpp +++ b/alc/context.cpp @@ -451,9 +451,7 @@ bool ALCcontext::has_eax() const noexcept bool ALCcontext::eax_is_capable() const noexcept { - return - eax_has_enough_aux_sends() && - eax_has_eax_reverb_effect(); + return eax_has_enough_aux_sends(); } void ALCcontext::eax_uninitialize() noexcept @@ -716,23 +714,9 @@ void ALCcontext::eax_ensure_enough_aux_sends() const } } -bool ALCcontext::eax_has_eax_reverb_effect() const noexcept -{ - return !DisabledEffects[EAXREVERB_EFFECT]; -} - -void ALCcontext::eax_ensure_eax_reverb_effect() const -{ - if (!eax_has_eax_reverb_effect()) - { - eax_fail("Disabled EAX Reverb Effect."); - } -} - void ALCcontext::eax_ensure_compatibility() { eax_ensure_enough_aux_sends(); - eax_ensure_eax_reverb_effect(); } unsigned long ALCcontext::eax_detect_speaker_configuration() const diff --git a/alc/context.h b/alc/context.h index 682012c7..93b70d83 100644 --- a/alc/context.h +++ b/alc/context.h @@ -361,10 +361,6 @@ private: void eax_ensure_enough_aux_sends() const; - bool eax_has_eax_reverb_effect() const noexcept; - - void eax_ensure_eax_reverb_effect() const; - void eax_ensure_compatibility(); |