diff options
| -rw-r--r-- | Alc/alu.cpp | 10 | ||||
| -rw-r--r-- | OpenAL32/Include/alAuxEffectSlot.h | 2 | ||||
| -rw-r--r-- | OpenAL32/alAuxEffectSlot.cpp | 6 |
3 files changed, 9 insertions, 9 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); } diff --git a/OpenAL32/Include/alAuxEffectSlot.h b/OpenAL32/Include/alAuxEffectSlot.h index ca2cb663..6e315e8f 100644 --- a/OpenAL32/Include/alAuxEffectSlot.h +++ b/OpenAL32/Include/alAuxEffectSlot.h @@ -81,7 +81,7 @@ struct ALeffectslot { ALenum EffectType{AL_EFFECT_NULL}; ALeffectProps EffectProps{}; - EffectState *EffectState{nullptr}; + EffectState *mEffectState{nullptr}; ALfloat RoomRolloff{0.0f}; /* Added to the source's room rolloff, not multiplied. */ ALfloat DecayTime{0.0f}; diff --git a/OpenAL32/alAuxEffectSlot.cpp b/OpenAL32/alAuxEffectSlot.cpp index cab9e43d..d4608bf1 100644 --- a/OpenAL32/alAuxEffectSlot.cpp +++ b/OpenAL32/alAuxEffectSlot.cpp @@ -650,7 +650,7 @@ ALenum InitEffectSlot(ALeffectslot *slot) if(!slot->Effect.State) return AL_OUT_OF_MEMORY; slot->Effect.State->IncRef(); - slot->Params.EffectState = slot->Effect.State; + slot->Params.mEffectState = slot->Effect.State; return AL_NO_ERROR; } @@ -666,8 +666,8 @@ ALeffectslot::~ALeffectslot() if(Effect.State) Effect.State->DecRef(); - if(Params.EffectState) - Params.EffectState->DecRef(); + if(Params.mEffectState) + Params.mEffectState->DecRef(); } void UpdateEffectSlotProps(ALeffectslot *slot, ALCcontext *context) |