aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Alc/ALc.c9
-rw-r--r--Alc/backends/coreaudio.c1
-rw-r--r--Alc/backends/dsound.c2
-rw-r--r--Alc/backends/mmdevapi.c2
-rw-r--r--Alc/backends/opensl.c1
-rw-r--r--Alc/backends/pulseaudio.c1
-rw-r--r--Alc/backends/wave.c7
-rw-r--r--Alc/backends/winmm.c1
-rw-r--r--Alc/effects/reverb.c2
-rw-r--r--Alc/panning.c19
-rw-r--r--OpenAL32/Include/alMain.h2
11 files changed, 6 insertions, 41 deletions
diff --git a/Alc/ALc.c b/Alc/ALc.c
index 1119a270..cfd3a077 100644
--- a/Alc/ALc.c
+++ b/Alc/ALc.c
@@ -1293,7 +1293,6 @@ const ALCchar *DevFmtChannelsString(enum DevFmtChannels chans)
case DevFmtX51Rear: return "5.1 Surround (Rear)";
case DevFmtX61: return "6.1 Surround";
case DevFmtX71: return "7.1 Surround";
- case DevFmtBFormat3D: return "B-Format 3D";
case DevFmtAmbi1: return "Ambisonics (1st Order)";
case DevFmtAmbi2: return "Ambisonics (2nd Order)";
case DevFmtAmbi3: return "Ambisonics (3rd Order)";
@@ -1327,7 +1326,6 @@ ALuint ChannelsFromDevFmt(enum DevFmtChannels chans)
case DevFmtX51Rear: return 6;
case DevFmtX61: return 7;
case DevFmtX71: return 8;
- case DevFmtBFormat3D: return 4;
case DevFmtAmbi1: return 4;
case DevFmtAmbi2: return 9;
case DevFmtAmbi3: return 16;
@@ -1493,12 +1491,6 @@ void SetDefaultWFXChannelOrder(ALCdevice *device)
device->RealOut.ChannelName[6] = SideLeft;
device->RealOut.ChannelName[7] = SideRight;
break;
- case DevFmtBFormat3D:
- device->RealOut.ChannelName[0] = Aux0;
- device->RealOut.ChannelName[1] = Aux1;
- device->RealOut.ChannelName[2] = Aux2;
- device->RealOut.ChannelName[3] = Aux3;
- break;
case DevFmtAmbi1:
device->RealOut.ChannelName[0] = Aux0;
device->RealOut.ChannelName[1] = Aux1;
@@ -1575,7 +1567,6 @@ void SetDefaultChannelOrder(ALCdevice *device)
case DevFmtQuad:
case DevFmtX51:
case DevFmtX61:
- case DevFmtBFormat3D:
case DevFmtAmbi1:
case DevFmtAmbi2:
case DevFmtAmbi3:
diff --git a/Alc/backends/coreaudio.c b/Alc/backends/coreaudio.c
index 3d610fcb..cde3d505 100644
--- a/Alc/backends/coreaudio.c
+++ b/Alc/backends/coreaudio.c
@@ -528,7 +528,6 @@ static ALCenum ca_open_capture(ALCdevice *device, const ALCchar *deviceName)
case DevFmtX51Rear:
case DevFmtX61:
case DevFmtX71:
- case DevFmtBFormat3D:
case DevFmtAmbi1:
case DevFmtAmbi2:
case DevFmtAmbi3:
diff --git a/Alc/backends/dsound.c b/Alc/backends/dsound.c
index a477360c..bb38d516 100644
--- a/Alc/backends/dsound.c
+++ b/Alc/backends/dsound.c
@@ -472,7 +472,6 @@ static ALCboolean ALCdsoundPlayback_reset(ALCdsoundPlayback *self)
case DevFmtMono:
OutputType.dwChannelMask = SPEAKER_FRONT_CENTER;
break;
- case DevFmtBFormat3D:
case DevFmtAmbi1:
case DevFmtAmbi2:
case DevFmtAmbi3:
@@ -791,7 +790,6 @@ static ALCenum ALCdsoundCapture_open(ALCdsoundCapture *self, const ALCchar *devi
SPEAKER_SIDE_LEFT |
SPEAKER_SIDE_RIGHT;
break;
- case DevFmtBFormat3D:
case DevFmtAmbi1:
case DevFmtAmbi2:
case DevFmtAmbi3:
diff --git a/Alc/backends/mmdevapi.c b/Alc/backends/mmdevapi.c
index 03f2f56b..bcef0a5f 100644
--- a/Alc/backends/mmdevapi.c
+++ b/Alc/backends/mmdevapi.c
@@ -881,7 +881,6 @@ static HRESULT ALCmmdevPlayback_resetProxy(ALCmmdevPlayback *self)
OutputType.Format.nChannels = 1;
OutputType.dwChannelMask = MONO;
break;
- case DevFmtBFormat3D:
case DevFmtAmbi1:
case DevFmtAmbi2:
case DevFmtAmbi3:
@@ -1525,7 +1524,6 @@ static HRESULT ALCmmdevCapture_resetProxy(ALCmmdevCapture *self)
OutputType.dwChannelMask = X7DOT1;
break;
- case DevFmtBFormat3D:
case DevFmtAmbi1:
case DevFmtAmbi2:
case DevFmtAmbi3:
diff --git a/Alc/backends/opensl.c b/Alc/backends/opensl.c
index 7e053b81..0796c49a 100644
--- a/Alc/backends/opensl.c
+++ b/Alc/backends/opensl.c
@@ -79,7 +79,6 @@ static SLuint32 GetChannelMask(enum DevFmtChannels chans)
SL_SPEAKER_FRONT_CENTER|SL_SPEAKER_LOW_FREQUENCY|
SL_SPEAKER_BACK_LEFT|SL_SPEAKER_BACK_RIGHT|
SL_SPEAKER_SIDE_LEFT|SL_SPEAKER_SIDE_RIGHT;
- case DevFmtBFormat3D:
case DevFmtAmbi1:
case DevFmtAmbi2:
case DevFmtAmbi3:
diff --git a/Alc/backends/pulseaudio.c b/Alc/backends/pulseaudio.c
index a4d8438b..f46386e4 100644
--- a/Alc/backends/pulseaudio.c
+++ b/Alc/backends/pulseaudio.c
@@ -998,7 +998,6 @@ static ALCboolean ALCpulsePlayback_reset(ALCpulsePlayback *self)
case DevFmtMono:
mapname = "mono";
break;
- case DevFmtBFormat3D:
case DevFmtAmbi1:
case DevFmtAmbi2:
case DevFmtAmbi3:
diff --git a/Alc/backends/wave.c b/Alc/backends/wave.c
index 85b4c720..9bf5a727 100644
--- a/Alc/backends/wave.c
+++ b/Alc/backends/wave.c
@@ -249,7 +249,7 @@ static ALCboolean ALCwaveBackend_reset(ALCwaveBackend *self)
clearerr(self->mFile);
if(GetConfigValueBool(NULL, "wave", "bformat", 0))
- device->FmtChans = DevFmtBFormat3D;
+ device->FmtChans = DevFmtAmbi1;
switch(device->FmtType)
{
@@ -280,9 +280,8 @@ static ALCboolean ALCwaveBackend_reset(ALCwaveBackend *self)
case DevFmtAmbi1:
case DevFmtAmbi2:
case DevFmtAmbi3:
- device->FmtChans = DevFmtBFormat3D;
- /*fall-through*/
- case DevFmtBFormat3D:
+ /* .amb output requires FuMa */
+ device->AmbiFmt = AmbiFormat_FuMa;
isbformat = 1;
chanmask = 0;
break;
diff --git a/Alc/backends/winmm.c b/Alc/backends/winmm.c
index 45547cee..9d8f8e9d 100644
--- a/Alc/backends/winmm.c
+++ b/Alc/backends/winmm.c
@@ -561,7 +561,6 @@ static ALCenum ALCwinmmCapture_open(ALCwinmmCapture *self, const ALCchar *name)
case DevFmtX51Rear:
case DevFmtX61:
case DevFmtX71:
- case DevFmtBFormat3D:
case DevFmtAmbi1:
case DevFmtAmbi2:
case DevFmtAmbi3:
diff --git a/Alc/effects/reverb.c b/Alc/effects/reverb.c
index b89b1988..71c39f8c 100644
--- a/Alc/effects/reverb.c
+++ b/Alc/effects/reverb.c
@@ -961,7 +961,7 @@ static ALvoid ALreverbState_update(ALreverbState *State, const ALCdevice *Device
props->Reverb.LateReverbPan, gain,
props->Reverb.ReflectionsGain,
props->Reverb.LateReverbGain, State);
- else if(Device->AmbiDecoder || (Device->FmtChans >= DevFmtBFormat3D &&
+ else if(Device->AmbiDecoder || (Device->FmtChans >= DevFmtAmbi1 &&
Device->FmtChans <= DevFmtAmbi3))
Update3DPanning(Device, props->Reverb.ReflectionsPan,
props->Reverb.LateReverbPan, gain,
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:
diff --git a/OpenAL32/Include/alMain.h b/OpenAL32/Include/alMain.h
index dff94487..3b6113ef 100644
--- a/OpenAL32/Include/alMain.h
+++ b/OpenAL32/Include/alMain.h
@@ -447,7 +447,7 @@ enum DevFmtChannels {
/* Similar to 5.1, except using rear channels instead of sides */
DevFmtX51Rear = 0x80000000,
- DevFmtBFormat3D,
+ /* Ambisonic formats should be kept together */
DevFmtAmbi1,
DevFmtAmbi2,
DevFmtAmbi3,
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-02 21:40:31 +0000