src/modules/alsa/mixer/paths/analog-output-lineout.conf | 8 ++++++++
src/modules/alsa/mixer/paths/analog-output-speaker-always.conf | 4 ++++
src/modules/alsa/mixer/paths/analog-output-speaker.conf | 4 ++++
3 files changed, 16 insertions(+)
New commits:
commit 055824ce35b68fc353c1cd57c7b57253ac89849b
Author: Tanu Kaskinen <ta...@iki.fi>
Date: Fri Sep 18 09:59:45 2015 +0300
alsa-mixer: Add "Dock Line Out" jack handling to
analog-output-speaker-always
The jack is already in analog-output-speaker, so let's have the same
handling in analog-output-speaker-always too.
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 b6d9f94..732eafb 100644
--- a/src/modules/alsa/mixer/paths/analog-output-speaker-always.conf
+++ b/src/modules/alsa/mixer/paths/analog-output-speaker-always.conf
@@ -41,6 +41,10 @@ state.unplugged = unknown
state.plugged = no
state.unplugged = unknown
+[Jack Dock Line Out]
+state.plugged = no
+state.unplugged = unknown
+
[Element Hardware Master]
switch = mute
volume = merge
commit 6f1c6c0f6429dfbf620a26f36bcd8fc0707beea4
Author: Takashi Iwai <ti...@suse.de>
Date: Mon Jun 15 17:06:41 2015 +0200
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 <ti...@suse.de>
diff --git a/src/modules/alsa/mixer/paths/analog-output-lineout.conf
b/src/modules/alsa/mixer/paths/analog-output-lineout.conf
index 68f444a..773abc4 100644
--- a/src/modules/alsa/mixer/paths/analog-output-lineout.conf
+++ b/src/modules/alsa/mixer/paths/analog-output-lineout.conf
@@ -71,6 +71,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 39193dd..9e81e55 100644
--- a/src/modules/alsa/mixer/paths/analog-output-speaker.conf
+++ b/src/modules/alsa/mixer/paths/analog-output-speaker.conf
@@ -44,6 +44,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
_______________________________________________
pulseaudio-commits mailing list
pulseaudio-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/pulseaudio-commits
