diff options
author | Chris Robinson <[email protected]> | 2019-03-10 15:46:46 -0700 |
---|---|---|
committer | Chris Robinson <[email protected]> | 2019-03-10 15:46:46 -0700 |
commit | 030b24a40de0258ef4e9047aae6d770435060858 (patch) | |
tree | c5236476df49940e1e025a5a85a0c89aa8fbc6bb /Alc | |
parent | 663a6ce4e7dbd919fa60e9f86cf6439f69789bd8 (diff) |
Improve handling of voice's AmbiScales for upsampling
Diffstat (limited to 'Alc')
-rw-r--r-- | Alc/mixvoice.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/Alc/mixvoice.cpp b/Alc/mixvoice.cpp index b087c4dc..4c8b2761 100644 --- a/Alc/mixvoice.cpp +++ b/Alc/mixvoice.cpp @@ -607,11 +607,7 @@ void MixSource(ALvoice *voice, const ALuint SourceID, ALCcontext *Context, const Device->ResampledData, DstBufferSize)}; if((voice->Flags&VOICE_IS_AMBISONIC)) { - /* TODO: Does not properly handle HOA sources. Currently only - * first-order sources are possible, but in the future it would - * be desirable. - */ - const ALfloat hfscale{(chan==0) ? voice->AmbiScales[0] : voice->AmbiScales[1]}; + const ALfloat hfscale{voice->AmbiScales[chan]}; /* Beware the evil const_cast. It's safe since it's pointing to * either SrcData or Device->ResampledData (both non-const), * but the resample method takes its input as const float* and |