From: Alexander E. Patrakov <patrakov@gmail.com>
Date: Thu, 10 Apr 2014 15:13:43 +0000 (+0600)
Subject: Name HDMI outputs uniquely
X-Git-Url: https://code.delx.au/pulseaudio/commitdiff_plain/a5ba31bf9627b6c7d7f5e03cdccff2d52fa3299d

Name HDMI outputs uniquely

On Haswell hardware, there are multiple HDMI outputs capable of
digital sound output. As they were identically named, KDE's control
center was unable to distinguish them, restored the wrong profile and
thus routed sound to the wrong HDMI monitor.

Also, having identically-named menu items in other mixer applications
looks like a bug.
---

diff --git a/src/modules/alsa/mixer/profile-sets/extra-hdmi.conf b/src/modules/alsa/mixer/profile-sets/extra-hdmi.conf
index 96652f8c..191a652a 100644
--- a/src/modules/alsa/mixer/profile-sets/extra-hdmi.conf
+++ b/src/modules/alsa/mixer/profile-sets/extra-hdmi.conf
@@ -116,7 +116,7 @@ priority = 3
 direction = output
 
 [Mapping hdmi-stereo-extra1]
-description = Digital Stereo (HDMI)
+description = Digital Stereo (HDMI 2)
 device-strings = hdmi:%f,1
 paths-output = hdmi-output-1
 channel-map = left,right
@@ -124,7 +124,7 @@ priority = 2
 direction = output
 
 [Mapping hdmi-surround-extra1]
-description = Digital Surround 5.1 (HDMI)
+description = Digital Surround 5.1 (HDMI 2)
 device-strings = hdmi:%f,1
 paths-output = hdmi-output-1
 channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
@@ -132,7 +132,7 @@ priority = 1
 direction = output
 
 [Mapping hdmi-stereo-extra2]
-description = Digital Stereo (HDMI)
+description = Digital Stereo (HDMI 3)
 device-strings = hdmi:%f,2
 paths-output = hdmi-output-2
 channel-map = left,right
@@ -140,7 +140,7 @@ priority = 2
 direction = output
 
 [Mapping hdmi-surround-extra2]
-description = Digital Surround 5.1 (HDMI)
+description = Digital Surround 5.1 (HDMI 3)
 device-strings = hdmi:%f,2
 paths-output = hdmi-output-2
 channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
@@ -148,7 +148,7 @@ priority = 1
 direction = output
 
 [Mapping hdmi-stereo-extra3]
-description = Digital Stereo (HDMI)
+description = Digital Stereo (HDMI 4)
 device-strings = hdmi:%f,3
 paths-output = hdmi-output-3
 channel-map = left,right
@@ -156,7 +156,7 @@ priority = 2
 direction = output
 
 [Mapping hdmi-surround-extra3]
-description = Digital Surround 5.1 (HDMI)
+description = Digital Surround 5.1 (HDMI 4)
 device-strings = hdmi:%f,3
 paths-output = hdmi-output-3
 channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe