diff options
| -rw-r--r-- | Alc/ALu.c | 7 | ||||
| -rw-r--r-- | OpenAL32/Include/alEffect.h | 2 |
2 files changed, 4 insertions, 5 deletions
@@ -404,9 +404,7 @@ ALvoid CalcSourceParams(ALsource *ALSource, const ALCcontext *ALContext) for(i = 0;i < NumSends;i++) { RoomRolloff[i] = Rolloff; - if(ALSource->Send[i].Slot && - (ALSource->Send[i].Slot->effect.type == AL_EFFECT_REVERB || - ALSource->Send[i].Slot->effect.type == AL_EFFECT_EAXREVERB)) + if(ALSource->Send[i].Slot && IsReverbEffect(ALSource->Send[i].Slot->effect.type)) RoomRolloff[i] += ALSource->Send[i].Slot->effect.Params.Reverb.RoomRolloffFactor; } MinDist = ALSource->flRefDistance; @@ -580,8 +578,7 @@ ALvoid CalcSourceParams(ALsource *ALSource, const ALCcontext *ALContext) WetGain[i] = __min(WetGain[i],MaxVolume); WetGain[i] = __max(WetGain[i],MinVolume); - if(Slot->effect.type == AL_EFFECT_REVERB || - Slot->effect.type == AL_EFFECT_EAXREVERB) + if(IsReverbEffect(Slot->effect.type)) { /* Apply a decay-time transformation to the wet path, based on * the attenuation of the dry path. diff --git a/OpenAL32/Include/alEffect.h b/OpenAL32/Include/alEffect.h index 2e91c34c..7ff9fff3 100644 --- a/OpenAL32/Include/alEffect.h +++ b/OpenAL32/Include/alEffect.h @@ -78,6 +78,8 @@ typedef struct ALeffect ALuint effect; } ALeffect; +static __inline ALboolean IsReverbEffect(ALenum type) +{ return type == AL_EFFECT_REVERB || type == AL_EFFECT_EAXREVERB; } ALvoid ReleaseALEffects(ALCdevice *device); |