From 4b924e636b6e0651304b289a667d358d336d6d03 Mon Sep 17 00:00:00 2001
From: Chris Robinson <chris.kcat@gmail.com>
Date: Fri, 25 Aug 2023 02:10:18 -0700
Subject: Allow querying AL_EFFECTSLOT_EFFECT
This doesn't make much sense since the effect associated with the ID may be
modified and not represent the effect being played, or was even deleted and
isn't a valid effect ID, but Generic Software allows querying it so it should
be queryable for compatibility if nothing else.
---
al/auxeffectslot.cpp | 14 ++++++++++----
al/auxeffectslot.h | 4 +++-
2 files changed, 13 insertions(+), 5 deletions(-)
(limited to 'al')
diff --git a/al/auxeffectslot.cpp b/al/auxeffectslot.cpp
index 09db0736..66a65b5c 100644
--- a/al/auxeffectslot.cpp
+++ b/al/auxeffectslot.cpp
@@ -548,12 +548,12 @@ FORCE_ALIGN void AL_APIENTRY alAuxiliaryEffectSlotiDirect(ALCcontext *context, A
std::lock_guard<std::mutex> ___{device->EffectLock};
ALeffect *effect{value ? LookupEffect(device, static_cast<ALuint>(value)) : nullptr};
if(effect)
- err = slot->initEffect(effect->type, effect->Props, context);
+ err = slot->initEffect(effect->id, effect->type, effect->Props, context);
else
{
if(value != 0)
return context->setError(AL_INVALID_VALUE, "Invalid effect ID %u", value);
- err = slot->initEffect(AL_EFFECT_NULL, EffectProps{}, context);
+ err = slot->initEffect(0, AL_EFFECT_NULL, EffectProps{}, context);
}
}
if(err != AL_NO_ERROR) UNLIKELY
@@ -754,6 +754,10 @@ FORCE_ALIGN void AL_APIENTRY alGetAuxiliaryEffectSlotiDirect(ALCcontext *context
switch(param)
{
+ case AL_EFFECTSLOT_EFFECT:
+ *value = static_cast<ALint>(slot->EffectId);
+ break;
+
case AL_EFFECTSLOT_AUXILIARY_SEND_AUTO:
*value = slot->AuxSendAuto ? AL_TRUE : AL_FALSE;
break;
@@ -887,7 +891,7 @@ ALeffectslot::~ALeffectslot()
mSlot->InUse = false;
}
-ALenum ALeffectslot::initEffect(ALenum effectType, const EffectProps &effectProps,
+ALenum ALeffectslot::initEffect(ALuint effectId, ALenum effectType, const EffectProps &effectProps,
ALCcontext *context)
{
EffectSlotType newtype{EffectSlotTypeFromEnum(effectType)};
@@ -916,6 +920,7 @@ ALenum ALeffectslot::initEffect(ALenum effectType, const EffectProps &effectProp
}
else if(newtype != EffectSlotType::None)
Effect.Props = effectProps;
+ EffectId = effectId;
/* Remove state references from old effect slot property updates. */
EffectSlotProps *props{context->mFreeEffectslotProps.load()};
@@ -1445,7 +1450,8 @@ void ALeffectslot::eax_set_efx_slot_effect(EaxEffect &effect)
{
#define EAX_PREFIX "[EAX_SET_EFFECT_SLOT_EFFECT] "
- const auto error = initEffect(effect.al_effect_type_, effect.al_effect_props_, eax_al_context_);
+ const auto error = initEffect(0, effect.al_effect_type_, effect.al_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 9038647c..1ad0ffc4 100644
--- a/al/auxeffectslot.h
+++ b/al/auxeffectslot.h
@@ -46,6 +46,7 @@ enum class SlotState : ALenum {
};
struct ALeffectslot {
+ ALuint EffectId{};
float Gain{1.0f};
bool AuxSendAuto{true};
ALeffectslot *Target{nullptr};
@@ -74,7 +75,8 @@ struct ALeffectslot {
ALeffectslot& operator=(const ALeffectslot&) = delete;
~ALeffectslot();
- ALenum initEffect(ALenum effectType, const EffectProps &effectProps, ALCcontext *context);
+ ALenum initEffect(ALuint effectId, ALenum effectType, const EffectProps &effectProps,
+ ALCcontext *context);
void updateProps(ALCcontext *context);
static void SetName(ALCcontext *context, ALuint id, std::string_view name);
--
cgit v1.2.3