diff options
author | Chris Robinson <[email protected]> | 2012-04-19 22:28:01 -0700 |
---|---|---|
committer | Chris Robinson <[email protected]> | 2012-04-19 22:28:01 -0700 |
commit | c9e64596a4266bdb6a9b76e30068d725729123c3 (patch) | |
tree | 8271b7b3fad1b26c301ab62eed46389c1a2f2d56 /OpenAL32/alAuxEffectSlot.c | |
parent | 08bd5e8b37f63711a5d4d40418188e21c603f856 (diff) |
Use a consistent name for the self-id field
Diffstat (limited to 'OpenAL32/alAuxEffectSlot.c')
-rw-r--r-- | OpenAL32/alAuxEffectSlot.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/OpenAL32/alAuxEffectSlot.c b/OpenAL32/alAuxEffectSlot.c index b3385a40..400a9635 100644 --- a/OpenAL32/alAuxEffectSlot.c +++ b/OpenAL32/alAuxEffectSlot.c @@ -75,13 +75,13 @@ AL_API ALvoid AL_APIENTRY alGenAuxiliaryEffectSlots(ALsizei n, ALuint *effectslo Context->ActiveEffectSlots[Context->ActiveEffectSlotCount++] = slot; UnlockContext(Context); if(err == AL_NO_ERROR) - err = NewThunkEntry(&slot->effectslot); + err = NewThunkEntry(&slot->id); if(err == AL_NO_ERROR) - err = InsertUIntMapEntry(&Context->EffectSlotMap, slot->effectslot, slot); + err = InsertUIntMapEntry(&Context->EffectSlotMap, slot->id, slot); if(err != AL_NO_ERROR) { RemoveEffectSlotArray(Context, slot); - FreeThunkEntry(slot->effectslot); + FreeThunkEntry(slot->id); ALeffectState_Destroy(slot->EffectState); free(slot); @@ -90,7 +90,7 @@ AL_API ALvoid AL_APIENTRY alGenAuxiliaryEffectSlots(ALsizei n, ALuint *effectslo break; } - effectslots[i] = slot->effectslot; + effectslots[i] = slot->id; } } @@ -133,7 +133,7 @@ AL_API ALvoid AL_APIENTRY alDeleteAuxiliaryEffectSlots(ALsizei n, const ALuint * // Recheck that the effectslot is valid, because there could be duplicated names if((EffectSlot=RemoveEffectSlot(Context, effectslots[i])) == NULL) continue; - FreeThunkEntry(EffectSlot->effectslot); + FreeThunkEntry(EffectSlot->id); RemoveEffectSlotArray(Context, EffectSlot); ALeffectState_Destroy(EffectSlot->EffectState); @@ -318,7 +318,7 @@ AL_API ALvoid AL_APIENTRY alGetAuxiliaryEffectSloti(ALuint effectslot, ALenum pa switch(param) { case AL_EFFECTSLOT_EFFECT: - *piValue = EffectSlot->effect.effect; + *piValue = EffectSlot->effect.id; break; case AL_EFFECTSLOT_AUXILIARY_SEND_AUTO: @@ -623,7 +623,7 @@ ALvoid ReleaseALAuxiliaryEffectSlots(ALCcontext *Context) // Release effectslot structure ALeffectState_Destroy(temp->EffectState); - FreeThunkEntry(temp->effectslot); + FreeThunkEntry(temp->id); memset(temp, 0, sizeof(ALeffectslot)); free(temp); } |