diff options
| author | Chris Robinson <[email protected]> | 2021-07-30 07:38:26 -0700 |
|---|---|---|
| committer | Chris Robinson <[email protected]> | 2021-07-30 07:38:26 -0700 |
| commit | 29fba79cd5dd06888da22c7fc18779062c28fc3a (patch) | |
| tree | 1548234679191873024c7ead9eb07c6088885b7e /alc/backends/dsound.cpp | |
| parent | 486eca8ce68e15fa5fff6a53d410aee9251245dd (diff) | |
Avoid 5.1Rear as its own channel configuration
It messes with 5.1 sources using direct channels, and the surround channels are
supposed to map to the side labels. Individual backends can deal with the
channel order/label differences, as they already do to a degree.
Diffstat (limited to 'alc/backends/dsound.cpp')
| -rw-r--r-- | alc/backends/dsound.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/alc/backends/dsound.cpp b/alc/backends/dsound.cpp index 401f8165..6513e8f3 100644 --- a/alc/backends/dsound.cpp +++ b/alc/backends/dsound.cpp @@ -402,10 +402,8 @@ bool DSoundPlayback::reset() mDevice->FmtChans = DevFmtStereo; else if(speakers == DSSPEAKER_QUAD) mDevice->FmtChans = DevFmtQuad; - else if(speakers == DSSPEAKER_5POINT1_SURROUND) + else if(speakers == DSSPEAKER_5POINT1_SURROUND || speakers == DSSPEAKER_5POINT1_BACK) mDevice->FmtChans = DevFmtX51; - else if(speakers == DSSPEAKER_5POINT1_BACK) - mDevice->FmtChans = DevFmtX51Rear; else if(speakers == DSSPEAKER_7POINT1 || speakers == DSSPEAKER_7POINT1_SURROUND) mDevice->FmtChans = DevFmtX71; else @@ -422,7 +420,6 @@ bool DSoundPlayback::reset() case DevFmtStereo: OutputType.dwChannelMask = STEREO; break; case DevFmtQuad: OutputType.dwChannelMask = QUAD; break; case DevFmtX51: OutputType.dwChannelMask = X5DOT1; break; - case DevFmtX51Rear: OutputType.dwChannelMask = X5DOT1REAR; break; case DevFmtX61: OutputType.dwChannelMask = X6DOT1; break; case DevFmtX71: OutputType.dwChannelMask = X7DOT1; break; } @@ -639,7 +636,6 @@ void DSoundCapture::open(const char *name) case DevFmtStereo: InputType.dwChannelMask = STEREO; break; case DevFmtQuad: InputType.dwChannelMask = QUAD; break; case DevFmtX51: InputType.dwChannelMask = X5DOT1; break; - case DevFmtX51Rear: InputType.dwChannelMask = X5DOT1REAR; break; case DevFmtX61: InputType.dwChannelMask = X6DOT1; break; case DevFmtX71: InputType.dwChannelMask = X7DOT1; break; case DevFmtAmbi3D: |