Blame SOURCES/0035-alsa-mixer-Prioritize-hdmi-mappings-over-iec958-mapp.patch

b943aa
From 184c28795bb98ad14bdfcef01a475d5ba11e40d5 Mon Sep 17 00:00:00 2001
b943aa
From: Kristian Klausen <klausenbusk@hotmail.com>
b943aa
Date: Fri, 22 Sep 2017 17:54:14 +0000
b943aa
Subject: [PATCH 35/48] alsa-mixer: Prioritize hdmi-* mappings over iec958-*
b943aa
 mappings
b943aa
b943aa
Pulseaudio tries to pick the best profile (on startup or
b943aa
hotplugged), the best profile is the profile with the highest
b943aa
priority which isn't unavailable.
b943aa
Due to the facts that iec958 ports available status always (?)
b943aa
is unknown, and that it is generally more likely that a user use
b943aa
hdmi than iec958, lets prioritze hdmi over iec958.
b943aa
b943aa
This patch shift the analog-* mappings +5 and hdmi-* mappings +5.
b943aa
---
b943aa
 src/modules/alsa/mixer/profile-sets/default.conf | 80 ++++++++++++------------
b943aa
 1 file changed, 40 insertions(+), 40 deletions(-)
b943aa
b943aa
diff --git a/src/modules/alsa/mixer/profile-sets/default.conf b/src/modules/alsa/mixer/profile-sets/default.conf
b943aa
index c360e772..f5093830 100644
b943aa
--- a/src/modules/alsa/mixer/profile-sets/default.conf
b943aa
+++ b/src/modules/alsa/mixer/profile-sets/default.conf
b943aa
@@ -106,14 +106,14 @@ device-strings = hw:%f
b943aa
 channel-map = mono
b943aa
 paths-output = analog-output analog-output-lineout analog-output-speaker analog-output-headphones analog-output-headphones-2 analog-output-mono
b943aa
 paths-input = analog-input-front-mic analog-input-rear-mic analog-input-internal-mic analog-input-dock-mic analog-input analog-input-mic analog-input-linein analog-input-aux analog-input-video analog-input-tvtuner analog-input-fm analog-input-mic-line analog-input-headset-mic
b943aa
-priority = 2
b943aa
+priority = 7
b943aa
 
b943aa
 [Mapping analog-stereo]
b943aa
 device-strings = front:%f
b943aa
 channel-map = left,right
b943aa
 paths-output = analog-output analog-output-lineout analog-output-speaker analog-output-headphones analog-output-headphones-2
b943aa
 paths-input = analog-input-front-mic analog-input-rear-mic analog-input-internal-mic analog-input-dock-mic analog-input analog-input-mic analog-input-linein analog-input-aux analog-input-video analog-input-tvtuner analog-input-fm analog-input-mic-line analog-input-headphone-mic analog-input-headset-mic
b943aa
-priority = 10
b943aa
+priority = 15
b943aa
 
b943aa
 # If everything else fails, try to use hw:0 as a stereo device.
b943aa
 [Mapping stereo-fallback]
b943aa
@@ -128,35 +128,35 @@ priority = 1
b943aa
 device-strings = surround21:%f
b943aa
 channel-map = front-left,front-right,lfe
b943aa
 paths-output = analog-output analog-output-lineout analog-output-speaker
b943aa
-priority = 8
b943aa
+priority = 13
b943aa
 direction = output
b943aa
 
b943aa
 [Mapping analog-surround-40]
b943aa
 device-strings = surround40:%f
b943aa
 channel-map = front-left,front-right,rear-left,rear-right
b943aa
 paths-output = analog-output analog-output-lineout analog-output-speaker
b943aa
-priority = 7
b943aa
+priority = 12
b943aa
 direction = output
b943aa
 
b943aa
 [Mapping analog-surround-41]
b943aa
 device-strings = surround41:%f
b943aa
 channel-map = front-left,front-right,rear-left,rear-right,lfe
b943aa
 paths-output = analog-output analog-output-lineout analog-output-speaker
b943aa
-priority = 8
b943aa
+priority = 13
b943aa
 direction = output
b943aa
 
b943aa
 [Mapping analog-surround-50]
b943aa
 device-strings = surround50:%f
b943aa
 channel-map = front-left,front-right,rear-left,rear-right,front-center
b943aa
 paths-output = analog-output analog-output-lineout analog-output-speaker
b943aa
-priority = 7
b943aa
+priority = 12
b943aa
 direction = output
b943aa
 
b943aa
 [Mapping analog-surround-51]
b943aa
 device-strings = surround51:%f
b943aa
 channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
b943aa
 paths-output = analog-output analog-output-lineout analog-output-speaker
b943aa
-priority = 8
b943aa
+priority = 13
b943aa
 direction = output
b943aa
 
b943aa
 [Mapping analog-surround-71]
b943aa
@@ -164,7 +164,7 @@ device-strings = surround71:%f
b943aa
 channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe,side-left,side-right
b943aa
 description = Analog Surround 7.1
b943aa
 paths-output = analog-output analog-output-lineout analog-output-speaker
b943aa
-priority = 7
b943aa
+priority = 12
b943aa
 direction = output
b943aa
 
b943aa
 [Mapping iec958-stereo]
b943aa
@@ -200,7 +200,7 @@ description = Digital Stereo (HDMI)
b943aa
 device-strings = hdmi:%f
b943aa
 paths-output = hdmi-output-0
b943aa
 channel-map = left,right
b943aa
-priority = 4
b943aa
+priority = 9
b943aa
 direction = output
b943aa
 
b943aa
 [Mapping hdmi-surround]
b943aa
@@ -208,7 +208,7 @@ description = Digital Surround 5.1 (HDMI)
b943aa
 device-strings = hdmi:%f
b943aa
 paths-output = hdmi-output-0
b943aa
 channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
b943aa
-priority = 3
b943aa
+priority = 8
b943aa
 direction = output
b943aa
 
b943aa
 [Mapping hdmi-surround71]
b943aa
@@ -216,7 +216,7 @@ description = Digital Surround 7.1 (HDMI)
b943aa
 device-strings = hdmi:%f
b943aa
 paths-output = hdmi-output-0
b943aa
 channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe,side-left,side-right
b943aa
-priority = 3
b943aa
+priority = 8
b943aa
 direction = output
b943aa
 
b943aa
 [Mapping hdmi-dts-surround]
b943aa
@@ -224,7 +224,7 @@ description = Digital Surround 5.1 (HDMI/DTS)
b943aa
 device-strings = dcahdmi:%f
b943aa
 paths-output = hdmi-output-0
b943aa
 channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
b943aa
-priority = 1
b943aa
+priority = 6
b943aa
 direction = output
b943aa
 
b943aa
 [Mapping hdmi-stereo-extra1]
b943aa
@@ -232,7 +232,7 @@ description = Digital Stereo (HDMI 2)
b943aa
 device-strings = hdmi:%f,1
b943aa
 paths-output = hdmi-output-1
b943aa
 channel-map = left,right
b943aa
-priority = 2
b943aa
+priority = 7
b943aa
 direction = output
b943aa
 
b943aa
 [Mapping hdmi-surround-extra1]
b943aa
@@ -240,7 +240,7 @@ description = Digital Surround 5.1 (HDMI 2)
b943aa
 device-strings = hdmi:%f,1
b943aa
 paths-output = hdmi-output-1
b943aa
 channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
b943aa
-priority = 1
b943aa
+priority = 6
b943aa
 direction = output
b943aa
 
b943aa
 [Mapping hdmi-surround71-extra1]
b943aa
@@ -248,7 +248,7 @@ description = Digital Surround 7.1 (HDMI 2)
b943aa
 device-strings = hdmi:%f,1
b943aa
 paths-output = hdmi-output-1
b943aa
 channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe,side-left,side-right
b943aa
-priority = 1
b943aa
+priority = 6
b943aa
 direction = output
b943aa
 
b943aa
 [Mapping hdmi-dts-surround-extra1]
b943aa
@@ -256,7 +256,7 @@ description = Digital Surround 5.1 (HDMI 2/DTS)
b943aa
 device-strings = dcahdmi:%f,1
b943aa
 paths-output = hdmi-output-1
b943aa
 channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
b943aa
-priority = 1
b943aa
+priority = 6
b943aa
 direction = output
b943aa
 
b943aa
 [Mapping hdmi-stereo-extra2]
b943aa
@@ -264,7 +264,7 @@ description = Digital Stereo (HDMI 3)
b943aa
 device-strings = hdmi:%f,2
b943aa
 paths-output = hdmi-output-2
b943aa
 channel-map = left,right
b943aa
-priority = 2
b943aa
+priority = 7
b943aa
 direction = output
b943aa
 
b943aa
 [Mapping hdmi-surround-extra2]
b943aa
@@ -272,7 +272,7 @@ description = Digital Surround 5.1 (HDMI 3)
b943aa
 device-strings = hdmi:%f,2
b943aa
 paths-output = hdmi-output-2
b943aa
 channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
b943aa
-priority = 1
b943aa
+priority = 6
b943aa
 direction = output
b943aa
 
b943aa
 [Mapping hdmi-surround71-extra2]
b943aa
@@ -280,7 +280,7 @@ description = Digital Surround 7.1 (HDMI 3)
b943aa
 device-strings = hdmi:%f,2
b943aa
 paths-output = hdmi-output-2
b943aa
 channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe,side-left,side-right
b943aa
-priority = 1
b943aa
+priority = 6
b943aa
 direction = output
b943aa
 
b943aa
 [Mapping hdmi-dts-surround-extra2]
b943aa
@@ -288,7 +288,7 @@ description = Digital Surround 5.1 (HDMI 3/DTS)
b943aa
 device-strings = dcahdmi:%f,2
b943aa
 paths-output = hdmi-output-2
b943aa
 channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
b943aa
-priority = 1
b943aa
+priority = 6
b943aa
 direction = output
b943aa
 
b943aa
 [Mapping hdmi-stereo-extra3]
b943aa
@@ -296,7 +296,7 @@ description = Digital Stereo (HDMI 4)
b943aa
 device-strings = hdmi:%f,3
b943aa
 paths-output = hdmi-output-3
b943aa
 channel-map = left,right
b943aa
-priority = 2
b943aa
+priority = 7
b943aa
 direction = output
b943aa
 
b943aa
 [Mapping hdmi-surround-extra3]
b943aa
@@ -304,7 +304,7 @@ description = Digital Surround 5.1 (HDMI 4)
b943aa
 device-strings = hdmi:%f,3
b943aa
 paths-output = hdmi-output-3
b943aa
 channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
b943aa
-priority = 1
b943aa
+priority = 6
b943aa
 direction = output
b943aa
 
b943aa
 [Mapping hdmi-surround71-extra3]
b943aa
@@ -312,7 +312,7 @@ description = Digital Surround 7.1 (HDMI 4)
b943aa
 device-strings = hdmi:%f,3
b943aa
 paths-output = hdmi-output-3
b943aa
 channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe,side-left,side-right
b943aa
-priority = 1
b943aa
+priority = 6
b943aa
 direction = output
b943aa
 
b943aa
 [Mapping hdmi-dts-surround-extra3]
b943aa
@@ -320,7 +320,7 @@ description = Digital Surround 5.1 (HDMI 4/DTS)
b943aa
 device-strings = dcahdmi:%f,3
b943aa
 paths-output = hdmi-output-3
b943aa
 channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
b943aa
-priority = 1
b943aa
+priority = 6
b943aa
 direction = output
b943aa
 
b943aa
 [Mapping hdmi-stereo-extra4]
b943aa
@@ -328,7 +328,7 @@ description = Digital Stereo (HDMI 5)
b943aa
 device-strings = hdmi:%f,4
b943aa
 paths-output = hdmi-output-4
b943aa
 channel-map = left,right
b943aa
-priority = 2
b943aa
+priority = 7
b943aa
 direction = output
b943aa
 
b943aa
 [Mapping hdmi-surround-extra4]
b943aa
@@ -336,7 +336,7 @@ description = Digital Surround 5.1 (HDMI 5)
b943aa
 device-strings = hdmi:%f,4
b943aa
 paths-output = hdmi-output-4
b943aa
 channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
b943aa
-priority = 1
b943aa
+priority = 6
b943aa
 direction = output
b943aa
 
b943aa
 [Mapping hdmi-surround71-extra4]
b943aa
@@ -344,7 +344,7 @@ description = Digital Surround 7.1 (HDMI 5)
b943aa
 device-strings = hdmi:%f,4
b943aa
 paths-output = hdmi-output-4
b943aa
 channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe,side-left,side-right
b943aa
-priority = 1
b943aa
+priority = 6
b943aa
 direction = output
b943aa
 
b943aa
 [Mapping hdmi-dts-surround-extra4]
b943aa
@@ -352,7 +352,7 @@ description = Digital Surround 5.1 (HDMI 5/DTS)
b943aa
 device-strings = dcahdmi:%f,4
b943aa
 paths-output = hdmi-output-4
b943aa
 channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
b943aa
-priority = 1
b943aa
+priority = 6
b943aa
 direction = output
b943aa
 
b943aa
 [Mapping hdmi-stereo-extra5]
b943aa
@@ -360,7 +360,7 @@ description = Digital Stereo (HDMI 6)
b943aa
 device-strings = hdmi:%f,5
b943aa
 paths-output = hdmi-output-5
b943aa
 channel-map = left,right
b943aa
-priority = 2
b943aa
+priority = 7
b943aa
 direction = output
b943aa
 
b943aa
 [Mapping hdmi-surround-extra5]
b943aa
@@ -368,7 +368,7 @@ description = Digital Surround 5.1 (HDMI 6)
b943aa
 device-strings = hdmi:%f,5
b943aa
 paths-output = hdmi-output-5
b943aa
 channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
b943aa
-priority = 1
b943aa
+priority = 6
b943aa
 direction = output
b943aa
 
b943aa
 [Mapping hdmi-surround71-extra5]
b943aa
@@ -376,7 +376,7 @@ description = Digital Surround 7.1 (HDMI 6)
b943aa
 device-strings = hdmi:%f,5
b943aa
 paths-output = hdmi-output-5
b943aa
 channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe,side-left,side-right
b943aa
-priority = 1
b943aa
+priority = 6
b943aa
 direction = output
b943aa
 
b943aa
 [Mapping hdmi-dts-surround-extra5]
b943aa
@@ -384,7 +384,7 @@ description = Digital Surround 5.1 (HDMI 6/DTS)
b943aa
 device-strings = dcahdmi:%f,5
b943aa
 paths-output = hdmi-output-5
b943aa
 channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
b943aa
-priority = 1
b943aa
+priority = 6
b943aa
 direction = output
b943aa
 
b943aa
 [Mapping hdmi-stereo-extra6]
b943aa
@@ -392,7 +392,7 @@ description = Digital Stereo (HDMI 7)
b943aa
 device-strings = hdmi:%f,6
b943aa
 paths-output = hdmi-output-6
b943aa
 channel-map = left,right
b943aa
-priority = 2
b943aa
+priority = 7
b943aa
 direction = output
b943aa
 
b943aa
 [Mapping hdmi-surround-extra6]
b943aa
@@ -400,7 +400,7 @@ description = Digital Surround 5.1 (HDMI 7)
b943aa
 device-strings = hdmi:%f,6
b943aa
 paths-output = hdmi-output-6
b943aa
 channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
b943aa
-priority = 1
b943aa
+priority = 6
b943aa
 direction = output
b943aa
 
b943aa
 [Mapping hdmi-surround71-extra6]
b943aa
@@ -408,7 +408,7 @@ description = Digital Surround 7.1 (HDMI 7)
b943aa
 device-strings = hdmi:%f,6
b943aa
 paths-output = hdmi-output-6
b943aa
 channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe,side-left,side-right
b943aa
-priority = 1
b943aa
+priority = 6
b943aa
 direction = output
b943aa
 
b943aa
 [Mapping hdmi-dts-surround-extra6]
b943aa
@@ -416,7 +416,7 @@ description = Digital Surround 5.1 (HDMI 7/DTS)
b943aa
 device-strings = dcahdmi:%f,6
b943aa
 paths-output = hdmi-output-6
b943aa
 channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
b943aa
-priority = 1
b943aa
+priority = 6
b943aa
 direction = output
b943aa
 
b943aa
 [Mapping hdmi-stereo-extra7]
b943aa
@@ -424,7 +424,7 @@ description = Digital Stereo (HDMI 8)
b943aa
 device-strings = hdmi:%f,7
b943aa
 paths-output = hdmi-output-7
b943aa
 channel-map = left,right
b943aa
-priority = 2
b943aa
+priority = 7
b943aa
 direction = output
b943aa
 
b943aa
 [Mapping hdmi-surround-extra7]
b943aa
@@ -432,7 +432,7 @@ description = Digital Surround 5.1 (HDMI 8)
b943aa
 device-strings = hdmi:%f,7
b943aa
 paths-output = hdmi-output-7
b943aa
 channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
b943aa
-priority = 1
b943aa
+priority = 6
b943aa
 direction = output
b943aa
 
b943aa
 [Mapping hdmi-surround71-extra7]
b943aa
@@ -440,7 +440,7 @@ description = Digital Surround 7.1 (HDMI 8)
b943aa
 device-strings = hdmi:%f,7
b943aa
 paths-output = hdmi-output-7
b943aa
 channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe,side-left,side-right
b943aa
-priority = 1
b943aa
+priority = 6
b943aa
 direction = output
b943aa
 
b943aa
 [Mapping hdmi-dts-surround-extra7]
b943aa
@@ -448,7 +448,7 @@ description = Digital Surround 5.1 (HDMI 8/DTS)
b943aa
 device-strings = dcahdmi:%f,7
b943aa
 paths-output = hdmi-output-7
b943aa
 channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
b943aa
-priority = 1
b943aa
+priority = 6
b943aa
 direction = output
b943aa
 
b943aa
 [Mapping multichannel-output]
b943aa
-- 
b943aa
2.13.6
b943aa