summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Henningsson <david.henningsson@canonical.com>2012-12-07 16:37:23 +0100
committerDavid Henningsson <david.henningsson@canonical.com>2012-12-07 16:37:23 +0100
commit0f6bbcc3a583f02564264314b8ee45cd83f609a6 (patch)
tree9a33f3beeb9de3d16eccdb798187dcf37323a59a
parent18b79d2e13c2364e5dd0dea4107892ae0b557b28 (diff)
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>
-rw-r--r--src/modules/alsa/mixer/paths/analog-input-mic.conf.common3
-rw-r--r--src/modules/alsa/mixer/paths/analog-output-desktop-speaker.conf3
-rw-r--r--src/modules/alsa/mixer/paths/analog-output-headphones-2.conf3
-rw-r--r--src/modules/alsa/mixer/paths/analog-output-headphones.conf3
-rw-r--r--src/modules/alsa/mixer/paths/analog-output-speaker-always.conf3
-rw-r--r--src/modules/alsa/mixer/paths/analog-output-speaker.conf3
-rw-r--r--src/modules/alsa/mixer/paths/hdmi-output-0.conf3
-rw-r--r--src/modules/alsa/mixer/paths/hdmi-output-1.conf3
-rw-r--r--src/modules/alsa/mixer/paths/hdmi-output-2.conf3
-rw-r--r--src/modules/alsa/mixer/paths/hdmi-output-3.conf3
10 files changed, 30 insertions, 0 deletions
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 b1cdbaf12..27bbccbea 100644
--- 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 dfdecf417..099823ee3 100644
--- 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 284713bed..6161ff5a1 100644
--- 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 77a46f103..df0f19862 100644
--- 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 14d67b009..3ebdc4a67 100644
--- 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 a7e3c4c85..7b47fc242 100644
--- 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 a86cdbd07..69b39eca1 100644
--- 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 d579e4bf0..01eeeed58 100644
--- 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 fee57d704..597451127 100644
--- 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 4e6d14957..92a7acf9a 100644
--- 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