summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Robinson <[email protected]>2007-12-18 19:43:54 -0800
committerChris Robinson <[email protected]>2007-12-18 19:43:54 -0800
commita433ae0ff4067cbf07379a5aa77891fa143337d7 (patch)
tree42fa110166b073ed7483b3fcb3a87e57cf205b3e
parente5609279dae8578429e0605d2dabfe04bc1cab4a (diff)
Use the AuxSendAuto property of the effect slot
-rw-r--r--Alc/ALu.c4
-rw-r--r--OpenAL32/alAuxEffectSlot.c1
2 files changed, 3 insertions, 2 deletions
diff --git a/Alc/ALu.c b/Alc/ALu.c
index ccaa5fe5..30cd727f 100644
--- a/Alc/ALu.c
+++ b/Alc/ALu.c
@@ -302,7 +302,9 @@ static ALvoid CalcSourceParams(ALCcontext *ALContext, ALsource *ALSource,
// Source Gain + Attenuation
DryMix = SourceVolume * flAttenuation;
- WetMix = SourceVolume * (ALSource->WetGainAuto ? RoomAttenuation : 1.0f);
+ WetMix = SourceVolume * ((ALSource->WetGainAuto &&
+ ALSource->Send[0].Slot.AuxSendAuto) ?
+ RoomAttenuation : 1.0f);
// Clamp to Min/Max Gain
DryMix = __min(DryMix,MaxVolume);
diff --git a/OpenAL32/alAuxEffectSlot.c b/OpenAL32/alAuxEffectSlot.c
index 4b3368ad..6b8a335c 100644
--- a/OpenAL32/alAuxEffectSlot.c
+++ b/OpenAL32/alAuxEffectSlot.c
@@ -185,7 +185,6 @@ AL_API ALvoid AL_APIENTRY alAuxiliaryEffectSloti(ALuint effectslot, ALenum param
break;
case AL_EFFECTSLOT_AUXILIARY_SEND_AUTO:
- /* FIXME: Unused */
if(iValue == AL_TRUE || iValue == AL_FALSE)
ALEffectSlot->AuxSendAuto = iValue;
else