diff options
| author | Chris Robinson <[email protected]> | 2017-02-27 16:11:45 -0800 |
|---|---|---|
| committer | Chris Robinson <[email protected]> | 2017-02-27 16:11:45 -0800 |
| commit | a9610b3607e8dd23f731b614c3b0761c38cb36a8 (patch) | |
| tree | 6163c30f02668224717e4e055b340962d94b7bc7 /Alc/panning.c | |
| parent | 5c859af24ea44dabbbb31631309bb08a858a523e (diff) | |
Use separate enums for the ambisonic channel order and normalization
Diffstat (limited to 'Alc/panning.c')
| -rw-r--r-- | Alc/panning.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Alc/panning.c b/Alc/panning.c index 46f134a6..77f8e31b 100644 --- a/Alc/panning.c +++ b/Alc/panning.c @@ -546,10 +546,10 @@ static void InitPanning(ALCdevice *device) if(device->FmtChans >= DevFmtAmbi1 && device->FmtChans <= DevFmtAmbi3) { - const ALsizei *acnmap = (device->AmbiFmt == AmbiFormat_FuMa) ? FuMa2ACN : ACN2ACN; - const ALfloat *n3dscale = (device->AmbiFmt == AmbiFormat_FuMa) ? FuMa2N3DScale : - (device->AmbiFmt == AmbiFormat_ACN_SN3D) ? SN3D2N3DScale : - /*(device->AmbiFmt == AmbiFormat_ACN_N3D) ?*/ UnitScale; + const ALsizei *acnmap = (device->AmbiLayout == AmbiLayout_FuMa) ? FuMa2ACN : ACN2ACN; + const ALfloat *n3dscale = (device->AmbiScale == AmbiNorm_FuMa) ? FuMa2N3DScale : + (device->AmbiScale == AmbiNorm_SN3D) ? SN3D2N3DScale : + /*(device->AmbiScale == AmbiNorm_N3D) ?*/ UnitScale; count = (device->FmtChans == DevFmtAmbi3) ? 16 : (device->FmtChans == DevFmtAmbi2) ? 9 : |