From e2905b6bc9056f148b0e7ebcb8201ac32c730c4a Mon Sep 17 00:00:00 2001 From: Chris Robinson Date: Mon, 21 Sep 2009 02:57:17 -0700 Subject: Properly handle forced 32-bit float output with DSound --- Alc/dsound.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Alc/dsound.c b/Alc/dsound.c index 6846886d..ac172344 100644 --- a/Alc/dsound.c +++ b/Alc/dsound.c @@ -227,15 +227,15 @@ static ALCboolean DSoundResetPlayback(ALCdevice *device) hr = IDirectSound_GetSpeakerConfig(pData->lpDS, &speakers); if(SUCCEEDED(hr) && *(GetConfigValue(NULL, "format", "")) != 0) { - if(device->Format == AL_FORMAT_MONO8 || device->Format == AL_FORMAT_MONO16) + if(aluChannelsFromFormat(device->Format) == 1) speakers = DSSPEAKER_COMBINED(DSSPEAKER_MONO, 0); - else if(device->Format == AL_FORMAT_STEREO8 || device->Format == AL_FORMAT_STEREO16) + else if(aluChannelsFromFormat(device->Format) == 2) speakers = DSSPEAKER_COMBINED(DSSPEAKER_STEREO, 0); - else if(device->Format == AL_FORMAT_QUAD8 || device->Format == AL_FORMAT_QUAD16) + else if(aluChannelsFromFormat(device->Format) == 4) speakers = DSSPEAKER_COMBINED(DSSPEAKER_QUAD, 0); - else if(device->Format == AL_FORMAT_51CHN8 || device->Format == AL_FORMAT_51CHN16) + else if(aluChannelsFromFormat(device->Format) == 6) speakers = DSSPEAKER_COMBINED(DSSPEAKER_5POINT1, 0); - else if(device->Format == AL_FORMAT_71CHN8 || device->Format == AL_FORMAT_71CHN16) + else if(aluChannelsFromFormat(device->Format) == 8) speakers = DSSPEAKER_COMBINED(DSSPEAKER_7POINT1, 0); else { -- cgit v1.2.3