diff options
author | Chris Robinson <[email protected]> | 2018-11-19 23:48:45 -0800 |
---|---|---|
committer | Chris Robinson <[email protected]> | 2018-11-19 23:48:45 -0800 |
commit | eb2937de8419dddc73952feef5119e6a6be2a93d (patch) | |
tree | 2996b45cec9311be2e13fbb4a28edb059ea15c4b /Alc | |
parent | 288dbbe8864ac2ede7031138f73a20de4da6ca31 (diff) |
Avoid another case of a variable named the same as a type
Diffstat (limited to 'Alc')
-rw-r--r-- | Alc/alu.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Alc/alu.cpp b/Alc/alu.cpp index 6a2f0c01..3150ec4f 100644 --- a/Alc/alu.cpp +++ b/Alc/alu.cpp @@ -413,7 +413,7 @@ static bool CalcEffectSlotParams(ALeffectslot *slot, ALCcontext *context, bool f state = props->State; - if(state == slot->Params.EffectState) + if(state == slot->Params.mEffectState) { /* If the effect state is the same as current, we can decrement its * count safely to remove it from the update object (it can't reach @@ -428,9 +428,9 @@ static bool CalcEffectSlotParams(ALeffectslot *slot, ALCcontext *context, bool f * event. */ AsyncEvent evt = ASYNC_EVENT(EventType_ReleaseEffectState); - evt.u.mEffectState = slot->Params.EffectState; + evt.u.mEffectState = slot->Params.mEffectState; - slot->Params.EffectState = state; + slot->Params.mEffectState = state; props->State = NULL; if(LIKELY(ll_ringbuffer_write(context->AsyncEvents, &evt, 1) != 0)) @@ -449,7 +449,7 @@ static bool CalcEffectSlotParams(ALeffectslot *slot, ALCcontext *context, bool f AtomicReplaceHead(context->FreeEffectslotProps, props); } else - state = slot->Params.EffectState; + state = slot->Params.mEffectState; state->update(context, slot, &slot->Params.EffectProps); return true; @@ -1749,7 +1749,7 @@ void aluMixData(ALCdevice *device, ALvoid *OutBuffer, ALsizei NumSamples) for(i = 0;i < auxslots->count;i++) { const ALeffectslot *slot = auxslots->slot[i]; - EffectState *state = slot->Params.EffectState; + EffectState *state = slot->Params.mEffectState; state->process(SamplesToDo, slot->WetBuffer, state->mOutBuffer, state->mOutChannels); } |