summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2015-06-15 17:06:41 +0200
committerTanu Kaskinen <tanuk@iki.fi>2015-09-25 15:05:43 +0300
commit4a9916ba15c953c426dbc21ff1b8a156e0c200cb (patch)
tree89683881e2b83412bb1ac7430c7071f28d00ce3d /src
parentff24ea7695a426195aa2c5390fa2f82b74313ef6 (diff)
downloadpulseaudio-4a9916ba15c953c426dbc21ff1b8a156e0c200cb.tar.gz
alsa-mixer: Recognize "Dock Line Out" jack
Some machines provide "Dock Line Out Jack" control that should be handled like a normal line out. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'src')
-rw-r--r--src/modules/alsa/mixer/paths/analog-output-lineout.conf8
-rw-r--r--src/modules/alsa/mixer/paths/analog-output-speaker.conf4
2 files changed, 12 insertions, 0 deletions
diff --git a/src/modules/alsa/mixer/paths/analog-output-lineout.conf b/src/modules/alsa/mixer/paths/analog-output-lineout.conf
index 454810d8e..4add78d76 100644
--- a/src/modules/alsa/mixer/paths/analog-output-lineout.conf
+++ b/src/modules/alsa/mixer/paths/analog-output-lineout.conf
@@ -87,6 +87,14 @@ state.plugged = unknown
state.unplugged = unknown
required-any = any
+[Jack Dock Line Out]
+required-any = any
+
+[Jack Dock Line Out Phantom]
+state.plugged = unknown
+state.unplugged = unknown
+required-any = any
+
[Element Hardware Master]
switch = mute
volume = merge
diff --git a/src/modules/alsa/mixer/paths/analog-output-speaker.conf b/src/modules/alsa/mixer/paths/analog-output-speaker.conf
index ab02ad0a9..9f4dac414 100644
--- a/src/modules/alsa/mixer/paths/analog-output-speaker.conf
+++ b/src/modules/alsa/mixer/paths/analog-output-speaker.conf
@@ -52,6 +52,10 @@ state.unplugged = unknown
state.plugged = no
state.unplugged = unknown
+[Jack Dock Line Out]
+state.plugged = no
+state.unplugged = unknown
+
[Jack Speaker Phantom]
required-any = any
state.plugged = unknown