From bff5268ed49261db9bfe432a0439bb4d508d8997 Mon Sep 17 00:00:00 2001
From: Chris Robinson <chris.kcat@gmail.com>
Date: Sun, 31 Jul 2016 08:13:41 -0700
Subject: Remove DevFmtBFormat3D, which is covered by DevFmtAmbi1

---
 Alc/backends/coreaudio.c  | 1 -
 Alc/backends/dsound.c     | 2 --
 Alc/backends/mmdevapi.c   | 2 --
 Alc/backends/opensl.c     | 1 -
 Alc/backends/pulseaudio.c | 1 -
 Alc/backends/wave.c       | 7 +++----
 Alc/backends/winmm.c      | 1 -
 7 files changed, 3 insertions(+), 12 deletions(-)

(limited to 'Alc/backends')

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:
-- 
cgit v1.2.3