alsa-mixer: Support more phantom jacks

It's fairly uncommon, but it happens that jack detection is enabled
for some reason, e g hardware design. In that case, we cannot use
jack detection, but we can still use the hint to pick up that there
is a path.

Signed-off-by: David Henningsson <david.henningsson@canonical.com>

diff --git a/src/modules/alsa/mixer/paths/analog-input-dock-mic.conf b/src/modules/alsa/mixer/paths/analog-input-dock-mic.conf
index 240b5f092ca2f5b7ecc69d6e8e758071809b8ca7..f6ea94b9f4c6e4f48774f97faf1907b33a5409b7 100644 (file)
--- a/src/modules/alsa/mixer/paths/analog-input-dock-mic.conf
+++ b/src/modules/alsa/mixer/paths/analog-input-dock-mic.conf
@@ -25,6 +25,11 @@ name = analog-input-microphone-dock
 [Jack Dock Mic]
 required-any = any
 
+[Jack Dock Mic Phantom]
+state.plugged = unknown
+state.unplugged = unknown
+required-any = any
+
 [Element Dock Mic Boost]
 required-any = any
 switch = select

diff --git a/src/modules/alsa/mixer/paths/analog-input-front-mic.conf b/src/modules/alsa/mixer/paths/analog-input-front-mic.conf
index 0b069f99e6f6e5c6ac6ae2fc9a5f27d967a18bce..bb2e806898e15e7c9b9355e0c1daf3425e146d00 100644 (file)
--- a/src/modules/alsa/mixer/paths/analog-input-front-mic.conf
+++ b/src/modules/alsa/mixer/paths/analog-input-front-mic.conf
@@ -25,6 +25,11 @@ name = analog-input-microphone-front
 [Jack Front Mic]
 required-any = any
 
+[Jack Front Mic Phantom]
+required-any = any
+state.plugged = unknown
+state.unplugged = unknown
+
 [Element Front Mic Boost]
 required-any = any
 switch = select

diff --git a/src/modules/alsa/mixer/paths/analog-input-linein.conf b/src/modules/alsa/mixer/paths/analog-input-linein.conf
index 3bcf43612e7a93136bdbdd2b7c9849d9f378b39c..3a8c2a0a88084da6eb46e8ae092bbba6ac413a0b 100644 (file)
--- a/src/modules/alsa/mixer/paths/analog-input-linein.conf
+++ b/src/modules/alsa/mixer/paths/analog-input-linein.conf
@@ -24,6 +24,11 @@ priority = 81
 [Jack Line]
 required-any = any
 
+[Jack Line Phantom]
+required-any = any
+state.plugged = unknown
+state.unplugged = unknown
+
 [Element Capture]
 switch = mute
 volume = merge

diff --git a/src/modules/alsa/mixer/paths/analog-input-mic.conf b/src/modules/alsa/mixer/paths/analog-input-mic.conf
index 8aaf0cb0a7d7f7f7c69476d5dafef86ed3c9b802..9e5f0444652607cfb1197e504999417cc67f76d8 100644 (file)
--- a/src/modules/alsa/mixer/paths/analog-input-mic.conf
+++ b/src/modules/alsa/mixer/paths/analog-input-mic.conf
@@ -25,6 +25,11 @@ name = analog-input-microphone
 [Jack Mic]
 required-any = any
 
+[Jack Mic Phantom]
+required-any = any
+state.plugged = unknown
+state.unplugged = unknown
+
 [Element Mic Boost]
 required-any = any
 switch = select

diff --git a/src/modules/alsa/mixer/paths/analog-input-rear-mic.conf b/src/modules/alsa/mixer/paths/analog-input-rear-mic.conf
index 1e6fa5789ea46d0046fdd6f12e4e09a8553e3ca1..397efba923f06999633d7a9045cc55fac856d17a 100644 (file)
--- a/src/modules/alsa/mixer/paths/analog-input-rear-mic.conf
+++ b/src/modules/alsa/mixer/paths/analog-input-rear-mic.conf
@@ -25,6 +25,11 @@ name = analog-input-microphone-rear
 [Jack Rear Mic]
 required-any = any
 
+[Jack Rear Mic Phantom]
+required-any = any
+state.plugged = unknown
+state.unplugged = unknown
+
 [Element Rear Mic Boost]
 required-any = any
 switch = select

diff --git a/src/modules/alsa/mixer/paths/analog-output-headphones.conf b/src/modules/alsa/mixer/paths/analog-output-headphones.conf
index df0f1986267db963067c43fe962c8c205eff89c2..b878dc70620c08f554cef84f2c9ef00b7464c53a 100644 (file)
--- a/src/modules/alsa/mixer/paths/analog-output-headphones.conf
+++ b/src/modules/alsa/mixer/paths/analog-output-headphones.conf
@@ -28,9 +28,19 @@ device.icon_name = audio-headphones
 [Jack Front Headphone]
 required-any = any
 
+[Jack Front Headphone Phantom]
+required-any = any
+state.plugged = unknown
+state.unplugged = unknown
+
 [Jack Headphone]
 required-any = any
 
+[Jack Headphone Phantom]
+required-any = any
+state.plugged = unknown
+state.unplugged = unknown
+
 # This jack can be either a headphone *or* a mic. Used on some ASUS netbooks.
 [Jack Headphone Mic]
 required-any = any