From 29fba79cd5dd06888da22c7fc18779062c28fc3a Mon Sep 17 00:00:00 2001
From: Chris Robinson <chris.kcat@gmail.com>
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.
---
 alc/backends/pulseaudio.cpp | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

(limited to 'alc/backends/pulseaudio.cpp')

diff --git a/alc/backends/pulseaudio.cpp b/alc/backends/pulseaudio.cpp
index 23bcecad..cece08a0 100644
--- a/alc/backends/pulseaudio.cpp
+++ b/alc/backends/pulseaudio.cpp
@@ -785,7 +785,7 @@ void PulsePlayback::sinkInfoCallback(pa_context*, const pa_sink_info *info, int
         { DevFmtX71, X71ChanMap },
         { DevFmtX61, X61ChanMap },
         { DevFmtX51, X51ChanMap },
-        { DevFmtX51Rear, X51RearChanMap },
+        { DevFmtX51, X51RearChanMap },
         { DevFmtQuad, QuadChanMap },
         { DevFmtStereo, StereoChanMap },
         { DevFmtMono, MonoChanMap }
@@ -957,9 +957,6 @@ bool PulsePlayback::reset()
     case DevFmtX51:
         chanmap = X51ChanMap;
         break;
-    case DevFmtX51Rear:
-        chanmap = X51RearChanMap;
-        break;
     case DevFmtX61:
         chanmap = X61ChanMap;
         break;
@@ -1238,9 +1235,6 @@ void PulseCapture::open(const char *name)
     case DevFmtX51:
         chanmap = X51ChanMap;
         break;
-    case DevFmtX51Rear:
-        chanmap = X51RearChanMap;
-        break;
     case DevFmtX61:
         chanmap = X61ChanMap;
         break;
-- 
cgit v1.2.3