diff options
author | Chris Robinson <[email protected]> | 2016-03-31 02:14:13 -0700 |
---|---|---|
committer | Chris Robinson <[email protected]> | 2016-03-31 02:14:13 -0700 |
commit | 93047e2a7a74030374c0a2f113c1a74f71f6fab4 (patch) | |
tree | a41799aed5149ee0564ed7e3132f3e3c3d01f663 | |
parent | 2cd73a8d97da45eefbd4a0b7f0e82e2750519dca (diff) |
Use the 3D panned output for reverb with HQ decoding
This is less than ideal, but matching each reverb line to a speaker with
surround sound output is way too loud without the ambient volume scaling
offered by the "direct" panning.
-rw-r--r-- | Alc/effects/reverb.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Alc/effects/reverb.c b/Alc/effects/reverb.c index 5ec5f6cf..2aea0763 100644 --- a/Alc/effects/reverb.c +++ b/Alc/effects/reverb.c @@ -387,7 +387,7 @@ static ALboolean ALreverbState_deviceUpdate(ALreverbState *State, ALCdevice *Dev /* WARNING: This assumes the real output follows the virtual output in the * device's DryBuffer. */ - if(Device->Hrtf || Device->Uhj_Encoder || Device->AmbiDecoder) + if(Device->Hrtf || Device->Uhj_Encoder) State->ExtraChannels = ChannelsFromDevFmt(Device->FmtChans); else State->ExtraChannels = 0; @@ -957,12 +957,12 @@ 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 || Device->Uhj_Encoder || Device->AmbiDecoder) + 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) + else if(Device->FmtChans == DevFmtBFormat3D || Device->AmbiDecoder) Update3DPanning(Device, props->Reverb.ReflectionsPan, props->Reverb.LateReverbPan, gain, props->Reverb.ReflectionsGain, |