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

Use VECTOR_FIND_IF instead of a manual loop

Browse Source
This commit is contained in:
Chris Robinson
2014-07-06 05:16:44 -07:00
parent f809d3c81a
commit 23979ac648
1 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
OpenAL32/alAuxEffectSlot.c
+7 -11
View File
@@ -399,21 +399,17 @@ static ALenum AddEffectSlotArray(ALCcontext *context, ALeffectslot **start, ALsi
static void RemoveEffectSlotArray(ALCcontext *context, const ALeffectslot *slot)
{
ALeffectslot **slotlist, **slotlistend;
ALeffectslot **iter;
LockContext(context);
slotlist = VECTOR_ITER_BEGIN(context->ActiveAuxSlots);
slotlistend = VECTOR_ITER_END(context->ActiveAuxSlots);
while(slotlist != slotlistend)
#define MATCH_SLOT(_i) (slot == *(_i))
VECTOR_FIND_IF(iter, ALeffectslot*, context->ActiveAuxSlots, MATCH_SLOT);
if(iter != VECTOR_ITER_END(context->ActiveAuxSlots))
{
if(*slotlist == slot)
{
*slotlist = VECTOR_BACK(context->ActiveAuxSlots);
VECTOR_POP_BACK(context->ActiveAuxSlots);
break;
}
slotlist++;
*iter = VECTOR_BACK(context->ActiveAuxSlots);
VECTOR_POP_BACK(context->ActiveAuxSlots);
}
#undef MATCH_SLOT
UnlockContext(context);
}