From 29fba79cd5dd06888da22c7fc18779062c28fc3a Mon Sep 17 00:00:00 2001 From: Chris Robinson Date: Fri, 30 Jul 2021 07:38:26 -0700 Subject: 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. --- core/devformat.cpp | 2 -- 1 file changed, 2 deletions(-) (limited to 'core/devformat.cpp') diff --git a/core/devformat.cpp b/core/devformat.cpp index d13ef3c6..c841b634 100644 --- a/core/devformat.cpp +++ b/core/devformat.cpp @@ -26,7 +26,6 @@ uint ChannelsFromDevFmt(DevFmtChannels chans, uint ambiorder) noexcept case DevFmtStereo: return 2; case DevFmtQuad: return 4; case DevFmtX51: return 6; - case DevFmtX51Rear: return 6; case DevFmtX61: return 7; case DevFmtX71: return 8; case DevFmtAmbi3D: return (ambiorder+1) * (ambiorder+1); @@ -56,7 +55,6 @@ const char *DevFmtChannelsString(DevFmtChannels chans) noexcept case DevFmtStereo: return "Stereo"; case DevFmtQuad: return "Quadraphonic"; case DevFmtX51: return "5.1 Surround"; - case DevFmtX51Rear: return "5.1 Surround (Rear)"; case DevFmtX61: return "6.1 Surround"; case DevFmtX71: return "7.1 Surround"; case DevFmtAmbi3D: return "Ambisonic 3D"; -- cgit v1.2.3