alsa-mixer: Add device.icon-name property for some common ports

If we expose this information, UIs can use this to make better
decisions about what icon to display.

Signed-off-by: David Henningsson <david.henningsson@canonical.com>

diff --git a/src/modules/alsa/mixer/paths/analog-input-mic.conf.common b/src/modules/alsa/mixer/paths/analog-input-mic.conf.common
index b1cdbaf12c85e9d403c7843856fa81986834ad42..27bbccbea06eb4f2a1b40ecfaaead31c70d88ae0 100644 (file)
--- a/src/modules/alsa/mixer/paths/analog-input-mic.conf.common
+++ b/src/modules/alsa/mixer/paths/analog-input-mic.conf.common
@@ -18,6 +18,9 @@
 ;
 ; See analog-output.conf.common for an explanation on the directives
 
+[Properties]
+device.icon_name = audio-input-microphone
+
 [Element Line]
 switch = off
 volume = off

diff --git a/src/modules/alsa/mixer/paths/analog-output-desktop-speaker.conf b/src/modules/alsa/mixer/paths/analog-output-desktop-speaker.conf
index dfdecf417d020cb79312d5323c2f2dfcdf970bbf..099823ee330250eadbc25fb591bcceb7caf37a0f 100644 (file)
--- a/src/modules/alsa/mixer/paths/analog-output-desktop-speaker.conf
+++ b/src/modules/alsa/mixer/paths/analog-output-desktop-speaker.conf
@@ -22,6 +22,9 @@
 priority = 101
 name = analog-output-speaker
 
+[Properties]
+device.icon_name = audio-speakers
+
 [Element Hardware Master]
 switch = mute
 volume = merge

diff --git a/src/modules/alsa/mixer/paths/analog-output-headphones-2.conf b/src/modules/alsa/mixer/paths/analog-output-headphones-2.conf
index 284713bedf85e4eed2355b521638ef867c39851d..6161ff5a17a2759e8a5f9e0b179ba4184322ecf9 100644 (file)
--- a/src/modules/alsa/mixer/paths/analog-output-headphones-2.conf
+++ b/src/modules/alsa/mixer/paths/analog-output-headphones-2.conf
@@ -22,6 +22,9 @@
 priority = 89
 name = analog-output-headphones
 
+[Properties]
+device.icon_name = audio-headphones
+
 [Element Hardware Master]
 switch = mute
 volume = merge

diff --git a/src/modules/alsa/mixer/paths/analog-output-headphones.conf b/src/modules/alsa/mixer/paths/analog-output-headphones.conf
index 77a46f1030e1ce001be9316bd233ae1db7a29509..df0f1986267db963067c43fe962c8c205eff89c2 100644 (file)
--- a/src/modules/alsa/mixer/paths/analog-output-headphones.conf
+++ b/src/modules/alsa/mixer/paths/analog-output-headphones.conf
@@ -22,6 +22,9 @@
 priority = 90
 name = analog-output-headphones
 
+[Properties]
+device.icon_name = audio-headphones
+
 [Jack Front Headphone]
 required-any = any
 

diff --git a/src/modules/alsa/mixer/paths/analog-output-speaker-always.conf b/src/modules/alsa/mixer/paths/analog-output-speaker-always.conf
index 14d67b0095d44d2b1b3b10ce6b529cfe5b324e79..3ebdc4a67793b00ed9f85c7b98f5a6bc0446383c 100644 (file)
--- a/src/modules/alsa/mixer/paths/analog-output-speaker-always.conf
+++ b/src/modules/alsa/mixer/paths/analog-output-speaker-always.conf
@@ -23,6 +23,9 @@
 priority = 100
 name = analog-output-speaker
 
+[Properties]
+device.icon_name = audio-speakers
+
 [Jack Headphone]
 state.plugged = no
 state.unplugged = unknown

diff --git a/src/modules/alsa/mixer/paths/analog-output-speaker.conf b/src/modules/alsa/mixer/paths/analog-output-speaker.conf
index a7e3c4c85fb3f33a4bd040c661f46418a6da9c4e..7b47fc242d8febb1a897e876ab16a993b93e947e 100644 (file)
--- a/src/modules/alsa/mixer/paths/analog-output-speaker.conf
+++ b/src/modules/alsa/mixer/paths/analog-output-speaker.conf
@@ -22,6 +22,9 @@
 priority = 100
 name = analog-output-speaker
 
+[Properties]
+device.icon_name = audio-speakers
+
 [Jack Headphone]
 state.plugged = no
 state.unplugged = unknown

diff --git a/src/modules/alsa/mixer/paths/hdmi-output-0.conf b/src/modules/alsa/mixer/paths/hdmi-output-0.conf
index a86cdbd0714be02092e964b7ba3954ebeb96cb91..69b39eca14edec68ab6246ac5a5291a7a0dfd4d7 100644 (file)
--- a/src/modules/alsa/mixer/paths/hdmi-output-0.conf
+++ b/src/modules/alsa/mixer/paths/hdmi-output-0.conf
@@ -2,5 +2,8 @@
 description = HDMI / DisplayPort
 priority = 59
 
+[Properties]
+device.icon_name = video-display
+
 [Jack HDMI/DP,pcm=3]
 required = ignore

diff --git a/src/modules/alsa/mixer/paths/hdmi-output-1.conf b/src/modules/alsa/mixer/paths/hdmi-output-1.conf
index d579e4bf0848bd012e89c57667df0deb109eb036..01eeeed5864281981b18a724f2946b4d1919bd6b 100644 (file)
--- a/src/modules/alsa/mixer/paths/hdmi-output-1.conf
+++ b/src/modules/alsa/mixer/paths/hdmi-output-1.conf
@@ -2,5 +2,8 @@
 description = HDMI / DisplayPort 2
 priority = 58
 
+[Properties]
+device.icon_name = video-display
+
 [Jack HDMI/DP,pcm=7]
 required = ignore

diff --git a/src/modules/alsa/mixer/paths/hdmi-output-2.conf b/src/modules/alsa/mixer/paths/hdmi-output-2.conf
index fee57d704127d3dc33effe3716f012f5c26cffc4..597451127e584a30206bdb8c8e4521f13d9f7759 100644 (file)
--- a/src/modules/alsa/mixer/paths/hdmi-output-2.conf
+++ b/src/modules/alsa/mixer/paths/hdmi-output-2.conf
@@ -2,5 +2,8 @@
 description = HDMI / DisplayPort 3
 priority = 57
 
+[Properties]
+device.icon_name = video-display
+
 [Jack HDMI/DP,pcm=8]
 required = ignore

diff --git a/src/modules/alsa/mixer/paths/hdmi-output-3.conf b/src/modules/alsa/mixer/paths/hdmi-output-3.conf
index 4e6d14957d3ab5bd6f31ecb39c89e93b1e98872b..92a7acf9a33a9dfd11a2668c3f138f2e90a374f4 100644 (file)
--- a/src/modules/alsa/mixer/paths/hdmi-output-3.conf
+++ b/src/modules/alsa/mixer/paths/hdmi-output-3.conf
@@ -2,5 +2,8 @@
 description = HDMI / DisplayPort 4
 priority = 56
 
+[Properties]
+device.icon_name = video-display
+
 [Jack HDMI/DP,pcm=9]
 required = ignore