From 1a3f8007995ab87887989a6b1d05d0fdcff17783 Mon Sep 17 00:00:00 2001 From: David Henningsson Date: Thu, 21 Mar 2013 19:28:49 +0100 Subject: [PATCH] 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 --- .../alsa/mixer/paths/analog-input-dock-mic.conf | 5 +++++ .../alsa/mixer/paths/analog-input-front-mic.conf | 5 +++++ src/modules/alsa/mixer/paths/analog-input-linein.conf | 5 +++++ src/modules/alsa/mixer/paths/analog-input-mic.conf | 5 +++++ .../alsa/mixer/paths/analog-input-rear-mic.conf | 5 +++++ .../alsa/mixer/paths/analog-output-headphones.conf | 10 ++++++++++ 6 files changed, 35 insertions(+) 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 240b5f09..f6ea94b9 100644 --- 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 0b069f99..bb2e8068 100644 --- 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 3bcf4361..3a8c2a0a 100644 --- 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 8aaf0cb0..9e5f0444 100644 --- 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 1e6fa578..397efba9 100644 --- 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 df0f1986..b878dc70 100644 --- 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 -- 2.39.2