diff options
Diffstat (limited to 'OpenAL32')
| -rw-r--r-- | OpenAL32/Include/alAuxEffectSlot.h | 3 | ||||
| -rw-r--r-- | OpenAL32/alAuxEffectSlot.c | 24 |
2 files changed, 13 insertions, 14 deletions
diff --git a/OpenAL32/Include/alAuxEffectSlot.h b/OpenAL32/Include/alAuxEffectSlot.h index 28d890cc..b7fe3b4c 100644 --- a/OpenAL32/Include/alAuxEffectSlot.h +++ b/OpenAL32/Include/alAuxEffectSlot.h @@ -46,8 +46,7 @@ struct ALeffectState { }; ALeffectState *NoneCreate(void); -ALeffectState *EAXVerbCreate(void); -ALeffectState *VerbCreate(void); +ALeffectState *ReverbCreate(void); ALeffectState *EchoCreate(void); ALeffectState *ModulatorCreate(void); ALeffectState *DedicatedCreate(void); diff --git a/OpenAL32/alAuxEffectSlot.c b/OpenAL32/alAuxEffectSlot.c index 8d51569b..5cca2a51 100644 --- a/OpenAL32/alAuxEffectSlot.c +++ b/OpenAL32/alAuxEffectSlot.c @@ -530,15 +530,13 @@ static ALvoid InitializeEffect(ALCcontext *Context, ALeffectslot *EffectSlot, AL NewState = NoneCreate(); if(!NewState) err = AL_OUT_OF_MEMORY; } - else if(newtype == AL_EFFECT_EAXREVERB && EffectSlot->effect.type != AL_EFFECT_EAXREVERB) + else if(newtype == AL_EFFECT_EAXREVERB || newtype == AL_EFFECT_REVERB) { - NewState = EAXVerbCreate(); - if(!NewState) err = AL_OUT_OF_MEMORY; - } - else if(newtype == AL_EFFECT_REVERB && EffectSlot->effect.type != AL_EFFECT_REVERB) - { - NewState = VerbCreate(); - if(!NewState) err = AL_OUT_OF_MEMORY; + if(EffectSlot->effect.type != AL_EFFECT_EAXREVERB && EffectSlot->effect.type != AL_EFFECT_REVERB) + { + NewState = ReverbCreate(); + if(!NewState) err = AL_OUT_OF_MEMORY; + } } else if(newtype == AL_EFFECT_ECHO && EffectSlot->effect.type != AL_EFFECT_ECHO) { @@ -550,11 +548,13 @@ static ALvoid InitializeEffect(ALCcontext *Context, ALeffectslot *EffectSlot, AL NewState = ModulatorCreate(); if(!NewState) err = AL_OUT_OF_MEMORY; } - else if((newtype == AL_EFFECT_DEDICATED_DIALOGUE || newtype == AL_EFFECT_DEDICATED_LOW_FREQUENCY_EFFECT) && - EffectSlot->effect.type != AL_EFFECT_DEDICATED_DIALOGUE && EffectSlot->effect.type != AL_EFFECT_DEDICATED_LOW_FREQUENCY_EFFECT) + else if(newtype == AL_EFFECT_DEDICATED_DIALOGUE || newtype == AL_EFFECT_DEDICATED_LOW_FREQUENCY_EFFECT) { - NewState = DedicatedCreate(); - if(!NewState) err = AL_OUT_OF_MEMORY; + if(EffectSlot->effect.type != AL_EFFECT_DEDICATED_DIALOGUE && EffectSlot->effect.type != AL_EFFECT_DEDICATED_LOW_FREQUENCY_EFFECT) + { + NewState = DedicatedCreate(); + if(!NewState) err = AL_OUT_OF_MEMORY; + } } if(err != AL_NO_ERROR) |