aboutsummaryrefslogtreecommitdiffstats
path: root/Alc/effects
diff options
context:
space:
mode:
authorChris Robinson <[email protected]>2016-02-26 16:09:06 -0800
committerChris Robinson <[email protected]>2016-02-26 16:09:06 -0800
commitac91083ceb27892ce1d474a578634bff580b56d3 (patch)
tree91d10d8ab79d17e5b44c6876ccca5cfa2a553639 /Alc/effects
parent67f086d1d4527d1c920d90660124c5592b898354 (diff)
Use 2-channel UHJ for stereo output
Diffstat (limited to 'Alc/effects')
-rw-r--r--Alc/effects/reverb.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/Alc/effects/reverb.c b/Alc/effects/reverb.c
index 103db906..7bbdb8a7 100644
--- a/Alc/effects/reverb.c
+++ b/Alc/effects/reverb.c
@@ -659,7 +659,7 @@ static ALvoid UpdateEchoLine(ALfloat echoTime, ALfloat decayTime, ALfloat diffus
}
// Update the early and late 3D panning gains.
-static ALvoid UpdateHrtfPanning(const ALCdevice *Device, const ALfloat *ReflectionsPan, const ALfloat *LateReverbPan, ALfloat Gain, ALfloat EarlyGain, ALfloat LateGain, ALreverbState *State)
+static ALvoid UpdateMixedPanning(const ALCdevice *Device, const ALfloat *ReflectionsPan, const ALfloat *LateReverbPan, ALfloat Gain, ALfloat EarlyGain, ALfloat LateGain, ALreverbState *State)
{
ALfloat DirGains[MAX_OUTPUT_CHANNELS];
ALfloat coeffs[MAX_AMBI_COEFFS];
@@ -925,11 +925,11 @@ static ALvoid ALreverbState_update(ALreverbState *State, const ALCdevice *Device
gain = props->Reverb.Gain * Slot->Gain * ReverbBoost;
// Update early and late 3D panning.
- if(Device->Hrtf)
- UpdateHrtfPanning(Device, props->Reverb.ReflectionsPan,
- props->Reverb.LateReverbPan, gain,
- props->Reverb.ReflectionsGain,
- props->Reverb.LateReverbGain, State);
+ if(Device->Hrtf || Device->Uhj_Encoder)
+ UpdateMixedPanning(Device, props->Reverb.ReflectionsPan,
+ props->Reverb.LateReverbPan, gain,
+ props->Reverb.ReflectionsGain,
+ props->Reverb.LateReverbGain, State);
else if(Device->FmtChans == DevFmtBFormat3D)
Update3DPanning(Device, props->Reverb.ReflectionsPan,
props->Reverb.LateReverbPan, gain,