diff options
Diffstat (limited to 'OpenAL32')
| -rw-r--r-- | OpenAL32/Include/alAuxEffectSlot.h | 8 | ||||
| -rw-r--r-- | OpenAL32/alAuxEffectSlot.c | 14 | ||||
| -rw-r--r-- | OpenAL32/alState.c | 2 |
3 files changed, 12 insertions, 12 deletions
diff --git a/OpenAL32/Include/alAuxEffectSlot.h b/OpenAL32/Include/alAuxEffectSlot.h index 0ab0e2ab..cdff330f 100644 --- a/OpenAL32/Include/alAuxEffectSlot.h +++ b/OpenAL32/Include/alAuxEffectSlot.h @@ -51,10 +51,10 @@ ALeffectState *EchoCreate(void); ALeffectState *ModulatorCreate(void); ALeffectState *DedicatedCreate(void); -#define ALEffect_Destroy(a) ((a)->Destroy((a))) -#define ALEffect_DeviceUpdate(a,b) ((a)->DeviceUpdate((a),(b))) -#define ALEffect_Update(a,b,c) ((a)->Update((a),(b),(c))) -#define ALEffect_Process(a,b,c,d) ((a)->Process((a),(b),(c),(d))) +#define ALeffectState_Destroy(a) ((a)->Destroy((a))) +#define ALeffectState_DeviceUpdate(a,b) ((a)->DeviceUpdate((a),(b))) +#define ALeffectState_Update(a,b,c) ((a)->Update((a),(b),(c))) +#define ALeffectState_Process(a,b,c,d) ((a)->Process((a),(b),(c),(d))) #ifdef __cplusplus diff --git a/OpenAL32/alAuxEffectSlot.c b/OpenAL32/alAuxEffectSlot.c index 33831d29..df042815 100644 --- a/OpenAL32/alAuxEffectSlot.c +++ b/OpenAL32/alAuxEffectSlot.c @@ -100,7 +100,7 @@ AL_API ALvoid AL_APIENTRY alGenAuxiliaryEffectSlots(ALsizei n, ALuint *effectslo { RemoveEffectSlotArray(Context, slot); FreeThunkEntry(slot->effectslot); - ALEffect_Destroy(slot->EffectState); + ALeffectState_Destroy(slot->EffectState); free(slot); alSetError(Context, err); @@ -154,7 +154,7 @@ AL_API ALvoid AL_APIENTRY alDeleteAuxiliaryEffectSlots(ALsizei n, ALuint *effect FreeThunkEntry(EffectSlot->effectslot); RemoveEffectSlotArray(Context, EffectSlot); - ALEffect_Destroy(EffectSlot->EffectState); + ALeffectState_Destroy(EffectSlot->EffectState); memset(EffectSlot, 0, sizeof(ALeffectslot)); free(EffectSlot); @@ -564,10 +564,10 @@ static ALvoid InitializeEffect(ALCcontext *Context, ALeffectslot *EffectSlot, AL if(State) { - if(ALEffect_DeviceUpdate(State, Context->Device) == AL_FALSE) + if(ALeffectState_DeviceUpdate(State, Context->Device) == AL_FALSE) { UnlockContext(Context); - ALEffect_Destroy(State); + ALeffectState_Destroy(State); alSetError(Context, AL_OUT_OF_MEMORY); return; } @@ -581,10 +581,10 @@ static ALvoid InitializeEffect(ALCcontext *Context, ALeffectslot *EffectSlot, AL * object was changed, it needs an update before its Process method can * be called. */ EffectSlot->NeedsUpdate = AL_FALSE; - ALEffect_Update(EffectSlot->EffectState, Context, EffectSlot); + ALeffectState_Update(EffectSlot->EffectState, Context, EffectSlot); UnlockContext(Context); - ALEffect_Destroy(State); + ALeffectState_Destroy(State); State = NULL; } else @@ -608,7 +608,7 @@ ALvoid ReleaseALAuxiliaryEffectSlots(ALCcontext *Context) Context->EffectSlotMap.array[pos].value = NULL; // Release effectslot structure - ALEffect_Destroy(temp->EffectState); + ALeffectState_Destroy(temp->EffectState); FreeThunkEntry(temp->effectslot); memset(temp, 0, sizeof(ALeffectslot)); diff --git a/OpenAL32/alState.c b/OpenAL32/alState.c index d8151eab..6e474430 100644 --- a/OpenAL32/alState.c +++ b/OpenAL32/alState.c @@ -614,7 +614,7 @@ AL_API ALvoid AL_APIENTRY alDeferUpdatesSOFT(void) while(slot != slot_end) { if(ExchangeInt(&(*slot)->NeedsUpdate, AL_FALSE)) - ALEffect_Update((*slot)->EffectState, Context, *slot); + ALeffectState_Update((*slot)->EffectState, Context, *slot); slot++; } |