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 /core | |
| 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 'core')
| -rw-r--r-- | core/devformat.cpp | 2 | ||||
| -rw-r--r-- | core/devformat.h | 3 |
2 files changed, 0 insertions, 5 deletions
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"; diff --git a/core/devformat.h b/core/devformat.h index 34695361..e6d30924 100644 --- a/core/devformat.h +++ b/core/devformat.h @@ -50,9 +50,6 @@ enum DevFmtChannels : unsigned char { DevFmtX71, DevFmtAmbi3D, - /* Similar to 5.1, except using rear channels instead of sides */ - DevFmtX51Rear, - DevFmtChannelsDefault = DevFmtStereo }; #define MAX_OUTPUT_CHANNELS 16 |