diff options
Diffstat (limited to 'Alc/backends')
| -rw-r--r-- | Alc/backends/coreaudio.c | 3 | ||||
| -rw-r--r-- | Alc/backends/dsound.c | 6 | ||||
| -rw-r--r-- | Alc/backends/mmdevapi.c | 6 | ||||
| -rw-r--r-- | Alc/backends/opensl.c | 6 | ||||
| -rw-r--r-- | Alc/backends/pulseaudio.c | 3 | ||||
| -rw-r--r-- | Alc/backends/wave.c | 5 | ||||
| -rw-r--r-- | Alc/backends/winmm.c | 3 |
7 files changed, 31 insertions, 1 deletions
diff --git a/Alc/backends/coreaudio.c b/Alc/backends/coreaudio.c index 4907f362..3d610fcb 100644 --- a/Alc/backends/coreaudio.c +++ b/Alc/backends/coreaudio.c @@ -529,6 +529,9 @@ static ALCenum ca_open_capture(ALCdevice *device, const ALCchar *deviceName) case DevFmtX61: case DevFmtX71: case DevFmtBFormat3D: + case DevFmtAmbi1: + case DevFmtAmbi2: + case DevFmtAmbi3: ERR("%s not supported\n", DevFmtChannelsString(device->FmtChans)); goto error; } diff --git a/Alc/backends/dsound.c b/Alc/backends/dsound.c index da6fbacf..a477360c 100644 --- a/Alc/backends/dsound.c +++ b/Alc/backends/dsound.c @@ -473,6 +473,9 @@ static ALCboolean ALCdsoundPlayback_reset(ALCdsoundPlayback *self) OutputType.dwChannelMask = SPEAKER_FRONT_CENTER; break; case DevFmtBFormat3D: + case DevFmtAmbi1: + case DevFmtAmbi2: + case DevFmtAmbi3: device->FmtChans = DevFmtStereo; /*fall-through*/ case DevFmtStereo: @@ -789,6 +792,9 @@ static ALCenum ALCdsoundCapture_open(ALCdsoundCapture *self, const ALCchar *devi SPEAKER_SIDE_RIGHT; break; case DevFmtBFormat3D: + case DevFmtAmbi1: + case DevFmtAmbi2: + case DevFmtAmbi3: break; } diff --git a/Alc/backends/mmdevapi.c b/Alc/backends/mmdevapi.c index 60d3be00..03f2f56b 100644 --- a/Alc/backends/mmdevapi.c +++ b/Alc/backends/mmdevapi.c @@ -882,6 +882,9 @@ static HRESULT ALCmmdevPlayback_resetProxy(ALCmmdevPlayback *self) OutputType.dwChannelMask = MONO; break; case DevFmtBFormat3D: + case DevFmtAmbi1: + case DevFmtAmbi2: + case DevFmtAmbi3: device->FmtChans = DevFmtStereo; /*fall-through*/ case DevFmtStereo: @@ -1523,6 +1526,9 @@ static HRESULT ALCmmdevCapture_resetProxy(ALCmmdevCapture *self) break; case DevFmtBFormat3D: + case DevFmtAmbi1: + case DevFmtAmbi2: + case DevFmtAmbi3: return E_FAIL; } switch(device->FmtType) diff --git a/Alc/backends/opensl.c b/Alc/backends/opensl.c index 7b8fdb25..7e053b81 100644 --- a/Alc/backends/opensl.c +++ b/Alc/backends/opensl.c @@ -79,7 +79,11 @@ 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: break; + case DevFmtBFormat3D: + case DevFmtAmbi1: + case DevFmtAmbi2: + case DevFmtAmbi3: + break; } return 0; } diff --git a/Alc/backends/pulseaudio.c b/Alc/backends/pulseaudio.c index 220c1b7d..a4d8438b 100644 --- a/Alc/backends/pulseaudio.c +++ b/Alc/backends/pulseaudio.c @@ -999,6 +999,9 @@ static ALCboolean ALCpulsePlayback_reset(ALCpulsePlayback *self) mapname = "mono"; break; case DevFmtBFormat3D: + case DevFmtAmbi1: + case DevFmtAmbi2: + case DevFmtAmbi3: device->FmtChans = DevFmtStereo; /*fall-through*/ case DevFmtStereo: diff --git a/Alc/backends/wave.c b/Alc/backends/wave.c index af996233..85b4c720 100644 --- a/Alc/backends/wave.c +++ b/Alc/backends/wave.c @@ -277,6 +277,11 @@ static ALCboolean ALCwaveBackend_reset(ALCwaveBackend *self) case DevFmtX51Rear: chanmask = 0x01 | 0x02 | 0x04 | 0x08 | 0x010 | 0x020; break; case DevFmtX61: chanmask = 0x01 | 0x02 | 0x04 | 0x08 | 0x100 | 0x200 | 0x400; break; case DevFmtX71: chanmask = 0x01 | 0x02 | 0x04 | 0x08 | 0x010 | 0x020 | 0x200 | 0x400; break; + case DevFmtAmbi1: + case DevFmtAmbi2: + case DevFmtAmbi3: + device->FmtChans = DevFmtBFormat3D; + /*fall-through*/ case DevFmtBFormat3D: isbformat = 1; chanmask = 0; diff --git a/Alc/backends/winmm.c b/Alc/backends/winmm.c index 6e990a35..45547cee 100644 --- a/Alc/backends/winmm.c +++ b/Alc/backends/winmm.c @@ -562,6 +562,9 @@ static ALCenum ALCwinmmCapture_open(ALCwinmmCapture *self, const ALCchar *name) case DevFmtX61: case DevFmtX71: case DevFmtBFormat3D: + case DevFmtAmbi1: + case DevFmtAmbi2: + case DevFmtAmbi3: return ALC_INVALID_ENUM; } |