kcat/openal-soft
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Avoid another case of a variable named the same as a type

Browse Source
This commit is contained in:
Chris Robinson 2018-11-19 23:48:45 -08:00
parent 288dbbe886
commit eb2937de84
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Alc/alu.cpp
View File

@ -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);
}

2
OpenAL32/Include/alAuxEffectSlot.h
View File

@ -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};

6
OpenAL32/alAuxEffectSlot.cpp
View File

@ -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)