From b09aab8426b0feb74cacb8704b4953b3b56a8c30 Mon Sep 17 00:00:00 2001
From: Chris Robinson <chris.kcat@gmail.com>
Date: Mon, 7 Feb 2022 08:47:55 -0800
Subject: Don't pass an ALeffect to ALeffectslot::initEffect
---
al/auxeffectslot.cpp | 25 +++++++++++++++----------
al/auxeffectslot.h | 2 +-
2 files changed, 16 insertions(+), 11 deletions(-)
(limited to 'al')
diff --git a/al/auxeffectslot.cpp b/al/auxeffectslot.cpp
index 06e6b7a3..e0f2be73 100644
--- a/al/auxeffectslot.cpp
+++ b/al/auxeffectslot.cpp
@@ -582,9 +582,14 @@ START_API_FUNC
{
std::lock_guard<std::mutex> ___{device->EffectLock};
ALeffect *effect{value ? LookupEffect(device, static_cast<ALuint>(value)) : nullptr};
- if(!(value == 0 || effect != nullptr))
- SETERR_RETURN(context, AL_INVALID_VALUE,, "Invalid effect ID %u", value);
- err = slot->initEffect(effect, context.get());
+ if(effect)
+ err = slot->initEffect(effect->type, effect->Props, context.get());
+ else
+ {
+ if(value != 0)
+ SETERR_RETURN(context, AL_INVALID_VALUE,, "Invalid effect ID %u", value);
+ err = slot->initEffect(AL_EFFECT_NULL, EffectProps{}, context.get());
+ }
}
if UNLIKELY(err != AL_NO_ERROR)
{
@@ -939,9 +944,10 @@ ALeffectslot::~ALeffectslot()
mSlot.mEffectState->release();
}
-ALenum ALeffectslot::initEffect(ALeffect *effect, ALCcontext *context)
+ALenum ALeffectslot::initEffect(ALenum effectType, const EffectProps &effectProps,
+ ALCcontext *context)
{
- EffectSlotType newtype{EffectSlotTypeFromEnum(effect ? effect->type : AL_EFFECT_NULL)};
+ EffectSlotType newtype{EffectSlotTypeFromEnum(effectType)};
if(newtype != Effect.Type)
{
EffectStateFactory *factory{getFactoryByType(newtype)};
@@ -961,12 +967,12 @@ ALenum ALeffectslot::initEffect(ALeffect *effect, ALCcontext *context)
}
Effect.Type = newtype;
- Effect.Props = effect ? effect->Props : EffectProps{};
+ Effect.Props = effectProps;
Effect.State = std::move(state);
}
- else if(effect)
- Effect.Props = effect->Props;
+ else if(newtype != EffectSlotType::None)
+ Effect.Props = effectProps;
/* Remove state references from old effect slot property updates. */
EffectSlotProps *props{context->mFreeEffectslotProps.load()};
@@ -1726,8 +1732,7 @@ void ALeffectslot::eax_set_effect_slot_effect(
std::lock_guard<std::mutex> effect_slot_lock{eax_al_context_->mEffectSlotLock};
std::lock_guard<std::mutex> effect_lock{device.EffectLock};
- const auto error = initEffect(&effect, eax_al_context_);
-
+ const auto error = initEffect(effect.type, effect.Props, eax_al_context_);
if (error != AL_NO_ERROR)
{
ERR(EAX_PREFIX "%s\n", "Failed to initialize an effect.");
diff --git a/al/auxeffectslot.h b/al/auxeffectslot.h
index 12213df6..2c462cd0 100644
--- a/al/auxeffectslot.h
+++ b/al/auxeffectslot.h
@@ -65,7 +65,7 @@ struct ALeffectslot {
ALeffectslot& operator=(const ALeffectslot&) = delete;
~ALeffectslot();
- ALenum initEffect(ALeffect *effect, ALCcontext *context);
+ ALenum initEffect(ALenum effectType, const EffectProps &effectProps, ALCcontext *context);
void updateProps(ALCcontext *context);
/* This can be new'd for the context's default effect slot. */
--
cgit v1.2.3