aboutsummaryrefslogtreecommitdiffstats
path: root/Alc/panning.c
diff options
context:
space:
mode:
authorChris Robinson <[email protected]>2016-07-31 08:13:41 -0700
committerChris Robinson <[email protected]>2016-07-31 08:13:41 -0700
commitbff5268ed49261db9bfe432a0439bb4d508d8997 (patch)
treef0f5a2a44357dd7b9bb466f2a4ab018935f2707d /Alc/panning.c
parent2dd27568903033dfb017aaa85b53c6fa4abfd0de (diff)
Remove DevFmtBFormat3D, which is covered by DevFmtAmbi1
Diffstat (limited to 'Alc/panning.c')
-rw-r--r--Alc/panning.c19
1 files changed, 1 insertions, 18 deletions
diff --git a/Alc/panning.c b/Alc/panning.c
index 685c3de6..d4d7c25b 100644
--- a/Alc/panning.c
+++ b/Alc/panning.c
@@ -578,29 +578,13 @@ static void InitPanning(ALCdevice *device)
coeffcount = 16;
break;
- case DevFmtBFormat3D:
case DevFmtAmbi1:
case DevFmtAmbi2:
case DevFmtAmbi3:
break;
}
- if(device->FmtChans == DevFmtBFormat3D)
- {
- count = 4;
- for(i = 0;i < count;i++)
- {
- ALuint acn = FuMa2ACN[i];
- device->Dry.Ambi.Map[i].Scale = 1.0f/FuMa2N3DScale[acn];
- device->Dry.Ambi.Map[i].Index = acn;
- }
- device->Dry.CoeffCount = 0;
- device->Dry.NumChannels = count;
-
- device->FOAOut.Ambi = device->Dry.Ambi;
- device->FOAOut.CoeffCount = device->Dry.CoeffCount;
- }
- else if(device->FmtChans >= DevFmtAmbi1 && device->FmtChans <= DevFmtAmbi3)
+ if(device->FmtChans >= DevFmtAmbi1 && device->FmtChans <= DevFmtAmbi3)
{
const ALuint *acnmap = (device->AmbiFmt == AmbiFormat_FuMa) ? FuMa2ACN : ACN2ACN;
const ALfloat *n3dcale = (device->AmbiFmt == AmbiFormat_FuMa) ? FuMa2N3DScale :
@@ -885,7 +869,6 @@ void aluInitRenderer(ALCdevice *device, ALint hrtf_id, enum HrtfRequestMode hrtf
/* Mono, Stereo, and Ambisonics output don't use custom decoders. */
case DevFmtMono:
case DevFmtStereo:
- case DevFmtBFormat3D:
case DevFmtAmbi1:
case DevFmtAmbi2:
case DevFmtAmbi3: