These two control names are currently being added to the HDA driver, so let's support them in PulseAudio as well. Signed-off-by: David Henningsson <david.henningsson at canonical.com> --- v2: Addressed comments by Tanu src/modules/alsa/mixer/paths/analog-output-headphones-2.conf | 8 ++++++++ src/modules/alsa/mixer/paths/analog-output-headphones.conf | 11 +++++++++++ src/modules/alsa/mixer/paths/analog-output-lineout.conf | 12 ++++++++++++ src/modules/alsa/mixer/paths/analog-output-mono.conf | 10 ++++++++++ .../alsa/mixer/paths/analog-output-speaker-always.conf | 10 ++++++++++ src/modules/alsa/mixer/paths/analog-output-speaker.conf | 11 +++++++++++ 6 files changed, 62 insertions(+) diff --git a/src/modules/alsa/mixer/paths/analog-output-headphones-2.conf b/src/modules/alsa/mixer/paths/analog-output-headphones-2.conf index 74c467a..e29331b 100644 --- a/src/modules/alsa/mixer/paths/analog-output-headphones-2.conf +++ b/src/modules/alsa/mixer/paths/analog-output-headphones-2.conf @@ -48,6 +48,14 @@ volume = off switch = mute volume = zero +[Element Headphone+LO] +switch = mute +volume = zero + +[Element Speaker+LO] +switch = off +volume = off + [Element Headphone2] required = any switch = mute diff --git a/src/modules/alsa/mixer/paths/analog-output-headphones.conf b/src/modules/alsa/mixer/paths/analog-output-headphones.conf index a41d41f..1ef17cf 100644 --- a/src/modules/alsa/mixer/paths/analog-output-headphones.conf +++ b/src/modules/alsa/mixer/paths/analog-output-headphones.conf @@ -69,6 +69,17 @@ override-map.2 = all-left,all-right switch = off volume = off +[Element Speaker+LO] +switch = off +volume = off + +[Element Headphone+LO] +required-any = any +switch = mute +volume = merge +override-map.1 = all +override-map.2 = all-left,all-right + [Element Headphone] required-any = any switch = mute diff --git a/src/modules/alsa/mixer/paths/analog-output-lineout.conf b/src/modules/alsa/mixer/paths/analog-output-lineout.conf index 40af699..9160563 100644 --- a/src/modules/alsa/mixer/paths/analog-output-lineout.conf +++ b/src/modules/alsa/mixer/paths/analog-output-lineout.conf @@ -76,6 +76,18 @@ volume = merge override-map.1 = all override-map.2 = all-left,all-right +[Element Speaker+LO] +switch = mute +volume = merge +override-map.1 = all +override-map.2 = all-left,all-right + +[Element Headphone+LO] +switch = mute +volume = merge +override-map.1 = all +override-map.2 = all-left,all-right + [Element Master Mono] switch = off volume = off diff --git a/src/modules/alsa/mixer/paths/analog-output-mono.conf b/src/modules/alsa/mixer/paths/analog-output-mono.conf index 87b5081..589d4ce 100644 --- a/src/modules/alsa/mixer/paths/analog-output-mono.conf +++ b/src/modules/alsa/mixer/paths/analog-output-mono.conf @@ -45,6 +45,10 @@ override-map.2 = all-left,all-right switch = mute volume = zero +[Element Headphone+LO] +switch = mute +volume = zero + [Element Headphone2] switch = mute volume = zero @@ -55,6 +59,12 @@ volume = merge override-map.1 = all override-map.2 = all-left,all-right +[Element Speaker+LO] +switch = mute +volume = merge +override-map.1 = all +override-map.2 = all-left,all-right + [Element Desktop Speaker] switch = off volume = off 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 c511813..e5bfbf5 100644 --- a/src/modules/alsa/mixer/paths/analog-output-speaker-always.conf +++ b/src/modules/alsa/mixer/paths/analog-output-speaker-always.conf @@ -61,6 +61,16 @@ volume = zero switch = mute volume = zero +[Element Headphone+LO] +switch = off +volume = off + +[Element Speaker+LO] +switch = mute +volume = merge +override-map.1 = all +override-map.2 = all-left,all-right + [Element Speaker] 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 f708e61..1553731 100644 --- a/src/modules/alsa/mixer/paths/analog-output-speaker.conf +++ b/src/modules/alsa/mixer/paths/analog-output-speaker.conf @@ -73,6 +73,17 @@ volume = off switch = off volume = off +[Element Headphone+LO] +switch = off +volume = off + +[Element Speaker+LO] +required-any = any +switch = mute +volume = merge +override-map.1 = all +override-map.2 = all-left,all-right + [Element Speaker] required-any = any switch = mute -- 1.9.1
