summaryrefslogtreecommitdiffstats
path: root/src/modules/alsa/mixer/paths/analog-output.conf.common
diff options
context:
space:
mode:
authorDaniel Mack <daniel@caiaq.de>2009-11-11 10:48:39 +0100
committerDaniel Mack <daniel@caiaq.de>2009-11-11 10:48:39 +0100
commited7642ebac32bde8d9c47f3a1d8eabf75c3ea986 (patch)
tree9db77a271430da8abf7b6d11079bc660f7428094 /src/modules/alsa/mixer/paths/analog-output.conf.common
parent21ffcd55a5a425870f8f4c3b4933bc7cb352e339 (diff)
parent22946427624afde1d53973fa5a2e9e2041ffc5b7 (diff)
Merge branch 'master' of git://0pointer.de/pulseaudio
Diffstat (limited to 'src/modules/alsa/mixer/paths/analog-output.conf.common')
-rw-r--r--src/modules/alsa/mixer/paths/analog-output.conf.common17
1 files changed, 17 insertions, 0 deletions
diff --git a/src/modules/alsa/mixer/paths/analog-output.conf.common b/src/modules/alsa/mixer/paths/analog-output.conf.common
index 3c6ce803..fd7f0cfb 100644
--- a/src/modules/alsa/mixer/paths/analog-output.conf.common
+++ b/src/modules/alsa/mixer/paths/analog-output.conf.common
@@ -109,3 +109,20 @@ priority = 10
[Option External Amplifier:off]
name = output-amplifier-off
priority = 0
+
+;;; 'Analog Output'
+
+[Element Analog Output]
+enumeration = select
+
+[Option Analog Output:Speakers]
+name = output-speaker
+priority = 10
+
+[Option Analog Output:Headphones]
+name = output-headphones
+priority = 9
+
+[Option Analog Output:FP Headphones]
+name = output-headphones
+priority = 8