forked from pool/pulseaudio
54 lines
1.7 KiB
Diff
54 lines
1.7 KiB
Diff
|
From 594da41d07edcebc5fd319388852a66cc3f12ace Mon Sep 17 00:00:00 2001
|
||
|
From: Sjoerd Simons <sjoerd@luon.net>
|
||
|
Date: Sun, 31 Aug 2014 20:11:21 +0200
|
||
|
Subject: [PATCH] alsa-mixer: recognize Dock headphone jack
|
||
|
References: bnc#851362
|
||
|
|
||
|
Recognize the Dock headphone jack in the same way the normal & front
|
||
|
headphone jacks are detected.
|
||
|
|
||
|
Reviewed-by: David Henningsson <david.henningsson@canonical.com>
|
||
|
|
||
|
---
|
||
|
src/modules/alsa/mixer/paths/analog-output-headphones.conf | 8 ++++++++
|
||
|
src/modules/alsa/mixer/paths/analog-output-speaker.conf | 4 ++++
|
||
|
2 files changed, 12 insertions(+)
|
||
|
|
||
|
diff --git a/src/modules/alsa/mixer/paths/analog-output-headphones.conf b/src/modules/alsa/mixer/paths/analog-output-headphones.conf
|
||
|
index 5222c23027d1..a41d41f2dec9 100644
|
||
|
--- a/src/modules/alsa/mixer/paths/analog-output-headphones.conf
|
||
|
+++ b/src/modules/alsa/mixer/paths/analog-output-headphones.conf
|
||
|
@@ -25,6 +25,14 @@ description-key = analog-output-headphones
|
||
|
[Properties]
|
||
|
device.icon_name = audio-headphones
|
||
|
|
||
|
+[Jack Dock Headphone]
|
||
|
+required-any = any
|
||
|
+
|
||
|
+[Jack Dock Headphone Phantom]
|
||
|
+required-any = any
|
||
|
+state.plugged = unknown
|
||
|
+state.unplugged = unknown
|
||
|
+
|
||
|
[Jack Front Headphone]
|
||
|
required-any = any
|
||
|
|
||
|
diff --git a/src/modules/alsa/mixer/paths/analog-output-speaker.conf b/src/modules/alsa/mixer/paths/analog-output-speaker.conf
|
||
|
index d79fad1140fb..f708e618e4b6 100644
|
||
|
--- a/src/modules/alsa/mixer/paths/analog-output-speaker.conf
|
||
|
+++ b/src/modules/alsa/mixer/paths/analog-output-speaker.conf
|
||
|
@@ -29,6 +29,10 @@ device.icon_name = audio-speakers
|
||
|
state.plugged = no
|
||
|
state.unplugged = unknown
|
||
|
|
||
|
+[Jack Dock Headphone]
|
||
|
+state.plugged = no
|
||
|
+state.unplugged = unknown
|
||
|
+
|
||
|
[Jack Front Headphone]
|
||
|
state.plugged = no
|
||
|
state.unplugged = unknown
|
||
|
--
|
||
|
2.1.3
|
||
|
|