diff options
Diffstat (limited to 'OpenAL32')
| -rw-r--r-- | OpenAL32/alAuxEffectSlot.c | 41 | ||||
| -rw-r--r-- | OpenAL32/alEffect.c | 40 | ||||
| -rw-r--r-- | OpenAL32/alFilter.c | 42 |
3 files changed, 61 insertions, 62 deletions
diff --git a/OpenAL32/alAuxEffectSlot.c b/OpenAL32/alAuxEffectSlot.c index 400a9635..308a145e 100644 --- a/OpenAL32/alAuxEffectSlot.c +++ b/OpenAL32/alAuxEffectSlot.c @@ -161,7 +161,7 @@ AL_API ALboolean AL_APIENTRY alIsAuxiliaryEffectSlot(ALuint effectslot) return result; } -AL_API ALvoid AL_APIENTRY alAuxiliaryEffectSloti(ALuint effectslot, ALenum param, ALint iValue) +AL_API ALvoid AL_APIENTRY alAuxiliaryEffectSloti(ALuint effectslot, ALenum param, ALint value) { ALCdevice *Device; ALCcontext *Context; @@ -178,8 +178,7 @@ AL_API ALvoid AL_APIENTRY alAuxiliaryEffectSloti(ALuint effectslot, ALenum param case AL_EFFECTSLOT_EFFECT: { ALeffect *effect = NULL; - if(iValue == 0 || - (effect=LookupEffect(Device, iValue)) != NULL) + if(value == 0 || (effect=LookupEffect(Device, value)) != NULL) { ALenum err; err = InitializeEffect(Device, EffectSlot, effect); @@ -193,9 +192,9 @@ AL_API ALvoid AL_APIENTRY alAuxiliaryEffectSloti(ALuint effectslot, ALenum param } break; case AL_EFFECTSLOT_AUXILIARY_SEND_AUTO: - if(iValue == AL_TRUE || iValue == AL_FALSE) + if(value == AL_TRUE || value == AL_FALSE) { - EffectSlot->AuxSendAuto = iValue; + EffectSlot->AuxSendAuto = value; Context->UpdateSources = AL_TRUE; } else @@ -213,7 +212,7 @@ AL_API ALvoid AL_APIENTRY alAuxiliaryEffectSloti(ALuint effectslot, ALenum param ALCcontext_DecRef(Context); } -AL_API ALvoid AL_APIENTRY alAuxiliaryEffectSlotiv(ALuint effectslot, ALenum param, const ALint *piValues) +AL_API ALvoid AL_APIENTRY alAuxiliaryEffectSlotiv(ALuint effectslot, ALenum param, const ALint *values) { ALCcontext *Context; @@ -221,7 +220,7 @@ AL_API ALvoid AL_APIENTRY alAuxiliaryEffectSlotiv(ALuint effectslot, ALenum para { case AL_EFFECTSLOT_EFFECT: case AL_EFFECTSLOT_AUXILIARY_SEND_AUTO: - alAuxiliaryEffectSloti(effectslot, param, piValues[0]); + alAuxiliaryEffectSloti(effectslot, param, values[0]); return; } @@ -243,7 +242,7 @@ AL_API ALvoid AL_APIENTRY alAuxiliaryEffectSlotiv(ALuint effectslot, ALenum para ALCcontext_DecRef(Context); } -AL_API ALvoid AL_APIENTRY alAuxiliaryEffectSlotf(ALuint effectslot, ALenum param, ALfloat flValue) +AL_API ALvoid AL_APIENTRY alAuxiliaryEffectSlotf(ALuint effectslot, ALenum param, ALfloat value) { ALCcontext *Context; ALeffectslot *EffectSlot; @@ -256,9 +255,9 @@ AL_API ALvoid AL_APIENTRY alAuxiliaryEffectSlotf(ALuint effectslot, ALenum param switch(param) { case AL_EFFECTSLOT_GAIN: - if(flValue >= 0.0f && flValue <= 1.0f) + if(value >= 0.0f && value <= 1.0f) { - EffectSlot->Gain = flValue; + EffectSlot->Gain = value; EffectSlot->NeedsUpdate = AL_TRUE; } else @@ -276,14 +275,14 @@ AL_API ALvoid AL_APIENTRY alAuxiliaryEffectSlotf(ALuint effectslot, ALenum param ALCcontext_DecRef(Context); } -AL_API ALvoid AL_APIENTRY alAuxiliaryEffectSlotfv(ALuint effectslot, ALenum param, const ALfloat *pflValues) +AL_API ALvoid AL_APIENTRY alAuxiliaryEffectSlotfv(ALuint effectslot, ALenum param, const ALfloat *values) { ALCcontext *Context; switch(param) { case AL_EFFECTSLOT_GAIN: - alAuxiliaryEffectSlotf(effectslot, param, pflValues[0]); + alAuxiliaryEffectSlotf(effectslot, param, values[0]); return; } @@ -305,7 +304,7 @@ AL_API ALvoid AL_APIENTRY alAuxiliaryEffectSlotfv(ALuint effectslot, ALenum para ALCcontext_DecRef(Context); } -AL_API ALvoid AL_APIENTRY alGetAuxiliaryEffectSloti(ALuint effectslot, ALenum param, ALint *piValue) +AL_API ALvoid AL_APIENTRY alGetAuxiliaryEffectSloti(ALuint effectslot, ALenum param, ALint *value) { ALCcontext *Context; ALeffectslot *EffectSlot; @@ -318,11 +317,11 @@ AL_API ALvoid AL_APIENTRY alGetAuxiliaryEffectSloti(ALuint effectslot, ALenum pa switch(param) { case AL_EFFECTSLOT_EFFECT: - *piValue = EffectSlot->effect.id; + *value = EffectSlot->effect.id; break; case AL_EFFECTSLOT_AUXILIARY_SEND_AUTO: - *piValue = EffectSlot->AuxSendAuto; + *value = EffectSlot->AuxSendAuto; break; default: @@ -336,7 +335,7 @@ AL_API ALvoid AL_APIENTRY alGetAuxiliaryEffectSloti(ALuint effectslot, ALenum pa ALCcontext_DecRef(Context); } -AL_API ALvoid AL_APIENTRY alGetAuxiliaryEffectSlotiv(ALuint effectslot, ALenum param, ALint *piValues) +AL_API ALvoid AL_APIENTRY alGetAuxiliaryEffectSlotiv(ALuint effectslot, ALenum param, ALint *values) { ALCcontext *Context; @@ -344,7 +343,7 @@ AL_API ALvoid AL_APIENTRY alGetAuxiliaryEffectSlotiv(ALuint effectslot, ALenum p { case AL_EFFECTSLOT_EFFECT: case AL_EFFECTSLOT_AUXILIARY_SEND_AUTO: - alGetAuxiliaryEffectSloti(effectslot, param, piValues); + alGetAuxiliaryEffectSloti(effectslot, param, values); return; } @@ -366,7 +365,7 @@ AL_API ALvoid AL_APIENTRY alGetAuxiliaryEffectSlotiv(ALuint effectslot, ALenum p ALCcontext_DecRef(Context); } -AL_API ALvoid AL_APIENTRY alGetAuxiliaryEffectSlotf(ALuint effectslot, ALenum param, ALfloat *pflValue) +AL_API ALvoid AL_APIENTRY alGetAuxiliaryEffectSlotf(ALuint effectslot, ALenum param, ALfloat *value) { ALCcontext *Context; ALeffectslot *EffectSlot; @@ -379,7 +378,7 @@ AL_API ALvoid AL_APIENTRY alGetAuxiliaryEffectSlotf(ALuint effectslot, ALenum pa switch(param) { case AL_EFFECTSLOT_GAIN: - *pflValue = EffectSlot->Gain; + *value = EffectSlot->Gain; break; default: @@ -393,14 +392,14 @@ AL_API ALvoid AL_APIENTRY alGetAuxiliaryEffectSlotf(ALuint effectslot, ALenum pa ALCcontext_DecRef(Context); } -AL_API ALvoid AL_APIENTRY alGetAuxiliaryEffectSlotfv(ALuint effectslot, ALenum param, ALfloat *pflValues) +AL_API ALvoid AL_APIENTRY alGetAuxiliaryEffectSlotfv(ALuint effectslot, ALenum param, ALfloat *values) { ALCcontext *Context; switch(param) { case AL_EFFECTSLOT_GAIN: - alGetAuxiliaryEffectSlotf(effectslot, param, pflValues); + alGetAuxiliaryEffectSlotf(effectslot, param, values); return; } diff --git a/OpenAL32/alEffect.c b/OpenAL32/alEffect.c index 8af93e14..974d2657 100644 --- a/OpenAL32/alEffect.c +++ b/OpenAL32/alEffect.c @@ -144,7 +144,7 @@ AL_API ALboolean AL_APIENTRY alIsEffect(ALuint effect) return result; } -AL_API ALvoid AL_APIENTRY alEffecti(ALuint effect, ALenum param, ALint iValue) +AL_API ALvoid AL_APIENTRY alEffecti(ALuint effect, ALenum param, ALint value) { ALCcontext *Context; ALCdevice *Device; @@ -158,24 +158,24 @@ AL_API ALvoid AL_APIENTRY alEffecti(ALuint effect, ALenum param, ALint iValue) { if(param == AL_EFFECT_TYPE) { - ALboolean isOk = (iValue == AL_EFFECT_NULL); + ALboolean isOk = (value == AL_EFFECT_NULL); ALint i; for(i = 0;!isOk && EffectList[i].val;i++) { - if(iValue == EffectList[i].val && + if(value == EffectList[i].val && !DisabledEffects[EffectList[i].type]) isOk = AL_TRUE; } if(isOk) - InitEffectParams(ALEffect, iValue); + InitEffectParams(ALEffect, value); else alSetError(Context, AL_INVALID_VALUE); } else { /* Call the appropriate handler */ - ALeffect_SetParami(ALEffect, Context, param, iValue); + ALeffect_SetParami(ALEffect, Context, param, value); } } else @@ -184,7 +184,7 @@ AL_API ALvoid AL_APIENTRY alEffecti(ALuint effect, ALenum param, ALint iValue) ALCcontext_DecRef(Context); } -AL_API ALvoid AL_APIENTRY alEffectiv(ALuint effect, ALenum param, const ALint *piValues) +AL_API ALvoid AL_APIENTRY alEffectiv(ALuint effect, ALenum param, const ALint *values) { ALCcontext *Context; ALCdevice *Device; @@ -197,7 +197,7 @@ AL_API ALvoid AL_APIENTRY alEffectiv(ALuint effect, ALenum param, const ALint *p if((ALEffect=LookupEffect(Device, effect)) != NULL) { /* Call the appropriate handler */ - ALeffect_SetParamiv(ALEffect, Context, param, piValues); + ALeffect_SetParamiv(ALEffect, Context, param, values); } else alSetError(Context, AL_INVALID_NAME); @@ -205,7 +205,7 @@ AL_API ALvoid AL_APIENTRY alEffectiv(ALuint effect, ALenum param, const ALint *p ALCcontext_DecRef(Context); } -AL_API ALvoid AL_APIENTRY alEffectf(ALuint effect, ALenum param, ALfloat flValue) +AL_API ALvoid AL_APIENTRY alEffectf(ALuint effect, ALenum param, ALfloat value) { ALCcontext *Context; ALCdevice *Device; @@ -218,7 +218,7 @@ AL_API ALvoid AL_APIENTRY alEffectf(ALuint effect, ALenum param, ALfloat flValue if((ALEffect=LookupEffect(Device, effect)) != NULL) { /* Call the appropriate handler */ - ALeffect_SetParamf(ALEffect, Context, param, flValue); + ALeffect_SetParamf(ALEffect, Context, param, value); } else alSetError(Context, AL_INVALID_NAME); @@ -226,7 +226,7 @@ AL_API ALvoid AL_APIENTRY alEffectf(ALuint effect, ALenum param, ALfloat flValue ALCcontext_DecRef(Context); } -AL_API ALvoid AL_APIENTRY alEffectfv(ALuint effect, ALenum param, const ALfloat *pflValues) +AL_API ALvoid AL_APIENTRY alEffectfv(ALuint effect, ALenum param, const ALfloat *values) { ALCcontext *Context; ALCdevice *Device; @@ -239,7 +239,7 @@ AL_API ALvoid AL_APIENTRY alEffectfv(ALuint effect, ALenum param, const ALfloat if((ALEffect=LookupEffect(Device, effect)) != NULL) { /* Call the appropriate handler */ - ALeffect_SetParamfv(ALEffect, Context, param, pflValues); + ALeffect_SetParamfv(ALEffect, Context, param, values); } else alSetError(Context, AL_INVALID_NAME); @@ -247,7 +247,7 @@ AL_API ALvoid AL_APIENTRY alEffectfv(ALuint effect, ALenum param, const ALfloat ALCcontext_DecRef(Context); } -AL_API ALvoid AL_APIENTRY alGetEffecti(ALuint effect, ALenum param, ALint *piValue) +AL_API ALvoid AL_APIENTRY alGetEffecti(ALuint effect, ALenum param, ALint *value) { ALCcontext *Context; ALCdevice *Device; @@ -261,12 +261,12 @@ AL_API ALvoid AL_APIENTRY alGetEffecti(ALuint effect, ALenum param, ALint *piVal { if(param == AL_EFFECT_TYPE) { - *piValue = ALEffect->type; + *value = ALEffect->type; } else { /* Call the appropriate handler */ - ALeffect_GetParamiv(ALEffect, Context, param, piValue); + ALeffect_GetParamiv(ALEffect, Context, param, value); } } else @@ -275,7 +275,7 @@ AL_API ALvoid AL_APIENTRY alGetEffecti(ALuint effect, ALenum param, ALint *piVal ALCcontext_DecRef(Context); } -AL_API ALvoid AL_APIENTRY alGetEffectiv(ALuint effect, ALenum param, ALint *piValues) +AL_API ALvoid AL_APIENTRY alGetEffectiv(ALuint effect, ALenum param, ALint *values) { ALCcontext *Context; ALCdevice *Device; @@ -288,7 +288,7 @@ AL_API ALvoid AL_APIENTRY alGetEffectiv(ALuint effect, ALenum param, ALint *piVa if((ALEffect=LookupEffect(Device, effect)) != NULL) { /* Call the appropriate handler */ - ALeffect_GetParamiv(ALEffect, Context, param, piValues); + ALeffect_GetParamiv(ALEffect, Context, param, values); } else alSetError(Context, AL_INVALID_NAME); @@ -296,7 +296,7 @@ AL_API ALvoid AL_APIENTRY alGetEffectiv(ALuint effect, ALenum param, ALint *piVa ALCcontext_DecRef(Context); } -AL_API ALvoid AL_APIENTRY alGetEffectf(ALuint effect, ALenum param, ALfloat *pflValue) +AL_API ALvoid AL_APIENTRY alGetEffectf(ALuint effect, ALenum param, ALfloat *value) { ALCcontext *Context; ALCdevice *Device; @@ -309,7 +309,7 @@ AL_API ALvoid AL_APIENTRY alGetEffectf(ALuint effect, ALenum param, ALfloat *pfl if((ALEffect=LookupEffect(Device, effect)) != NULL) { /* Call the appropriate handler */ - ALeffect_GetParamf(ALEffect, Context, param, pflValue); + ALeffect_GetParamf(ALEffect, Context, param, value); } else alSetError(Context, AL_INVALID_NAME); @@ -317,7 +317,7 @@ AL_API ALvoid AL_APIENTRY alGetEffectf(ALuint effect, ALenum param, ALfloat *pfl ALCcontext_DecRef(Context); } -AL_API ALvoid AL_APIENTRY alGetEffectfv(ALuint effect, ALenum param, ALfloat *pflValues) +AL_API ALvoid AL_APIENTRY alGetEffectfv(ALuint effect, ALenum param, ALfloat *values) { ALCcontext *Context; ALCdevice *Device; @@ -330,7 +330,7 @@ AL_API ALvoid AL_APIENTRY alGetEffectfv(ALuint effect, ALenum param, ALfloat *pf if((ALEffect=LookupEffect(Device, effect)) != NULL) { /* Call the appropriate handler */ - ALeffect_GetParamfv(ALEffect, Context, param, pflValues); + ALeffect_GetParamfv(ALEffect, Context, param, values); } else alSetError(Context, AL_INVALID_NAME); diff --git a/OpenAL32/alFilter.c b/OpenAL32/alFilter.c index 6e7c72e7..31a62e52 100644 --- a/OpenAL32/alFilter.c +++ b/OpenAL32/alFilter.c @@ -140,7 +140,7 @@ AL_API ALboolean AL_APIENTRY alIsFilter(ALuint filter) return result; } -AL_API ALvoid AL_APIENTRY alFilteri(ALuint filter, ALenum param, ALint iValue) +AL_API ALvoid AL_APIENTRY alFilteri(ALuint filter, ALenum param, ALint value) { ALCcontext *Context; ALCdevice *Device; @@ -155,15 +155,15 @@ AL_API ALvoid AL_APIENTRY alFilteri(ALuint filter, ALenum param, ALint iValue) switch(param) { case AL_FILTER_TYPE: - if(iValue == AL_FILTER_NULL || iValue == AL_FILTER_LOWPASS) - InitFilterParams(ALFilter, iValue); + if(value == AL_FILTER_NULL || value == AL_FILTER_LOWPASS) + InitFilterParams(ALFilter, value); else alSetError(Context, AL_INVALID_VALUE); break; default: /* Call the appropriate handler */ - ALfilter_SetParami(ALFilter, Context, param, iValue); + ALfilter_SetParami(ALFilter, Context, param, value); break; } } @@ -173,7 +173,7 @@ AL_API ALvoid AL_APIENTRY alFilteri(ALuint filter, ALenum param, ALint iValue) ALCcontext_DecRef(Context); } -AL_API ALvoid AL_APIENTRY alFilteriv(ALuint filter, ALenum param, const ALint *piValues) +AL_API ALvoid AL_APIENTRY alFilteriv(ALuint filter, ALenum param, const ALint *values) { ALCcontext *Context; ALCdevice *Device; @@ -182,7 +182,7 @@ AL_API ALvoid AL_APIENTRY alFilteriv(ALuint filter, ALenum param, const ALint *p switch(param) { case AL_FILTER_TYPE: - alFilteri(filter, param, piValues[0]); + alFilteri(filter, param, values[0]); return; } @@ -193,7 +193,7 @@ AL_API ALvoid AL_APIENTRY alFilteriv(ALuint filter, ALenum param, const ALint *p if((ALFilter=LookupFilter(Device, filter)) != NULL) { /* Call the appropriate handler */ - ALfilter_SetParamiv(ALFilter, Context, param, piValues); + ALfilter_SetParamiv(ALFilter, Context, param, values); } else alSetError(Context, AL_INVALID_NAME); @@ -201,7 +201,7 @@ AL_API ALvoid AL_APIENTRY alFilteriv(ALuint filter, ALenum param, const ALint *p ALCcontext_DecRef(Context); } -AL_API ALvoid AL_APIENTRY alFilterf(ALuint filter, ALenum param, ALfloat flValue) +AL_API ALvoid AL_APIENTRY alFilterf(ALuint filter, ALenum param, ALfloat value) { ALCcontext *Context; ALCdevice *Device; @@ -214,7 +214,7 @@ AL_API ALvoid AL_APIENTRY alFilterf(ALuint filter, ALenum param, ALfloat flValue if((ALFilter=LookupFilter(Device, filter)) != NULL) { /* Call the appropriate handler */ - ALfilter_SetParamf(ALFilter, Context, param, flValue); + ALfilter_SetParamf(ALFilter, Context, param, value); } else alSetError(Context, AL_INVALID_NAME); @@ -222,7 +222,7 @@ AL_API ALvoid AL_APIENTRY alFilterf(ALuint filter, ALenum param, ALfloat flValue ALCcontext_DecRef(Context); } -AL_API ALvoid AL_APIENTRY alFilterfv(ALuint filter, ALenum param, const ALfloat *pflValues) +AL_API ALvoid AL_APIENTRY alFilterfv(ALuint filter, ALenum param, const ALfloat *values) { ALCcontext *Context; ALCdevice *Device; @@ -235,7 +235,7 @@ AL_API ALvoid AL_APIENTRY alFilterfv(ALuint filter, ALenum param, const ALfloat if((ALFilter=LookupFilter(Device, filter)) != NULL) { /* Call the appropriate handler */ - ALfilter_SetParamfv(ALFilter, Context, param, pflValues); + ALfilter_SetParamfv(ALFilter, Context, param, values); } else alSetError(Context, AL_INVALID_NAME); @@ -243,7 +243,7 @@ AL_API ALvoid AL_APIENTRY alFilterfv(ALuint filter, ALenum param, const ALfloat ALCcontext_DecRef(Context); } -AL_API ALvoid AL_APIENTRY alGetFilteri(ALuint filter, ALenum param, ALint *piValue) +AL_API ALvoid AL_APIENTRY alGetFilteri(ALuint filter, ALenum param, ALint *value) { ALCcontext *Context; ALCdevice *Device; @@ -258,12 +258,12 @@ AL_API ALvoid AL_APIENTRY alGetFilteri(ALuint filter, ALenum param, ALint *piVal switch(param) { case AL_FILTER_TYPE: - *piValue = ALFilter->type; + *value = ALFilter->type; break; default: /* Call the appropriate handler */ - ALfilter_GetParami(ALFilter, Context, param, piValue); + ALfilter_GetParami(ALFilter, Context, param, value); break; } } @@ -273,7 +273,7 @@ AL_API ALvoid AL_APIENTRY alGetFilteri(ALuint filter, ALenum param, ALint *piVal ALCcontext_DecRef(Context); } -AL_API ALvoid AL_APIENTRY alGetFilteriv(ALuint filter, ALenum param, ALint *piValues) +AL_API ALvoid AL_APIENTRY alGetFilteriv(ALuint filter, ALenum param, ALint *values) { ALCcontext *Context; ALCdevice *Device; @@ -282,7 +282,7 @@ AL_API ALvoid AL_APIENTRY alGetFilteriv(ALuint filter, ALenum param, ALint *piVa switch(param) { case AL_FILTER_TYPE: - alGetFilteri(filter, param, piValues); + alGetFilteri(filter, param, values); return; } @@ -293,7 +293,7 @@ AL_API ALvoid AL_APIENTRY alGetFilteriv(ALuint filter, ALenum param, ALint *piVa if((ALFilter=LookupFilter(Device, filter)) != NULL) { /* Call the appropriate handler */ - ALfilter_GetParamiv(ALFilter, Context, param, piValues); + ALfilter_GetParamiv(ALFilter, Context, param, values); } else alSetError(Context, AL_INVALID_NAME); @@ -301,7 +301,7 @@ AL_API ALvoid AL_APIENTRY alGetFilteriv(ALuint filter, ALenum param, ALint *piVa ALCcontext_DecRef(Context); } -AL_API ALvoid AL_APIENTRY alGetFilterf(ALuint filter, ALenum param, ALfloat *pflValue) +AL_API ALvoid AL_APIENTRY alGetFilterf(ALuint filter, ALenum param, ALfloat *value) { ALCcontext *Context; ALCdevice *Device; @@ -314,7 +314,7 @@ AL_API ALvoid AL_APIENTRY alGetFilterf(ALuint filter, ALenum param, ALfloat *pfl if((ALFilter=LookupFilter(Device, filter)) != NULL) { /* Call the appropriate handler */ - ALfilter_GetParamf(ALFilter, Context, param, pflValue); + ALfilter_GetParamf(ALFilter, Context, param, value); } else alSetError(Context, AL_INVALID_NAME); @@ -322,7 +322,7 @@ AL_API ALvoid AL_APIENTRY alGetFilterf(ALuint filter, ALenum param, ALfloat *pfl ALCcontext_DecRef(Context); } -AL_API ALvoid AL_APIENTRY alGetFilterfv(ALuint filter, ALenum param, ALfloat *pflValues) +AL_API ALvoid AL_APIENTRY alGetFilterfv(ALuint filter, ALenum param, ALfloat *values) { ALCcontext *Context; ALCdevice *Device; @@ -335,7 +335,7 @@ AL_API ALvoid AL_APIENTRY alGetFilterfv(ALuint filter, ALenum param, ALfloat *pf if((ALFilter=LookupFilter(Device, filter)) != NULL) { /* Call the appropriate handler */ - ALfilter_GetParamfv(ALFilter, Context, param, pflValues); + ALfilter_GetParamfv(ALFilter, Context, param, values); } else alSetError(Context, AL_INVALID_NAME); |