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

Cleanup and fix alAuxiliaryEffectSlotPlayv/StopvSOFT

Browse Source
This commit is contained in:
Chris Robinson
2020-09-05 21:37:35 -07:00
parent 13710b474e
commit 800e2b6125
1 changed files with 15 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
al/auxeffectslot.cpp
+15 -20
View File
@@ -404,30 +404,24 @@ START_API_FUNC
context->setError(AL_INVALID_VALUE, "Playing %d effect slots", n);
if UNLIKELY(n <= 0) return;
al::vector<ALeffectslot*> slots;
slots.reserve(static_cast<ALuint>(n));
auto slots = al::vector<ALeffectslot*>(static_cast<ALuint>(n));
std::lock_guard<std::mutex> _{context->mEffectSlotLock};
auto validate_slot = [&context,&slots](const ALuint id) -> bool
for(size_t i{0};i < slots.size();++i)
{
ALeffectslot *slot{LookupEffectSlot(context.get(), id)};
ALeffectslot *slot{LookupEffectSlot(context.get(), slotids[i])};
if UNLIKELY(!slot)
{
context->setError(AL_INVALID_NAME, "Invalid effect slot ID %u", id);
return false;
context->setError(AL_INVALID_NAME, "Invalid effect slot ID %u", slotids[i]);
return;
}
if(slot->mState != SlotState::Playing)
{
slot->PropsClean.test_and_set(std::memory_order_acq_rel);
slot->updateProps(context.get());
slots.emplace_back(slot);
}
return true;
slots[i] = slot;
};
auto slotids_end = slotids + n;
auto bad_slot = std::find_if_not(slotids, slotids_end, validate_slot);
if UNLIKELY(bad_slot != slotids_end) return;
AddActiveEffectSlots(slotids, static_cast<ALuint>(n), context.get());
for(auto slot : slots)
@@ -464,22 +458,23 @@ START_API_FUNC
context->setError(AL_INVALID_VALUE, "Stopping %d effect slots", n);
if UNLIKELY(n <= 0) return;
auto slots = al::vector<ALeffectslot*>(static_cast<ALuint>(n));
std::lock_guard<std::mutex> _{context->mEffectSlotLock};
auto validate_slot = [&context](const ALuint id) -> bool
for(size_t i{0};i < slots.size();++i)
{
ALeffectslot *slot{LookupEffectSlot(context.get(), id)};
ALeffectslot *slot{LookupEffectSlot(context.get(), slotids[i])};
if UNLIKELY(!slot)
{
context->setError(AL_INVALID_NAME, "Invalid effect slot ID %u", id);
return false;
context->setError(AL_INVALID_NAME, "Invalid effect slot ID %u", slotids[i]);
return;
}
return true;
slots[i] = slot;
};
auto slotids_end = slotids + n;
auto bad_slot = std::find_if_not(slotids, slotids_end, validate_slot);
if UNLIKELY(bad_slot != slotids_end) return;
RemoveActiveEffectSlots(slotids, static_cast<ALuint>(n), context.get());
for(auto slot : slots)
slot->mState = SlotState::Stopped;
}
END_API_FUNC