From: Tanu Kaskinen <tanuk@iki.fi>
Date: Sat, 26 Dec 2020 20:29:06 +0000 (+0200)
Subject: alsa-mixer: Add support for the Headphone,1 element
X-Git-Tag: v14.99.1~227
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=21a531041ab0b5e52dbde1e3ed4ab8fb49198fda;p=platform%2Fupstream%2Fpulseaudio.git

alsa-mixer: Add support for the Headphone,1 element

This is seen at least on HP EliteDesk 800 DM and HP EliteDesk 800 SFF.

This is used by the analog-output-headphones-2 path, but all other paths
on the same sink need to handle the element too. The existing
configuration is inconsistent between files regarding whether headphone
outputs should be muted or not when not using them. I chose to be
consistent within files, which means that Headphone,1 handling is
inconsistent between files in the same way that the existing Headphone
and Headphone2 handling is. (My opinion is that unused paths should be
always muted, but I didn't want to do that policy change in this patch.)

Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/272>
---

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 f88f8a0..1789990 100644
--- a/src/modules/alsa/mixer/paths/analog-output-headphones-2.conf
+++ b/src/modules/alsa/mixer/paths/analog-output-headphones-2.conf
@@ -54,6 +54,13 @@ volume = off
 switch = mute
 volume = zero
 
+[Element Headphone,1]
+required-any = any
+switch = mute
+volume = merge
+override-map.1 = all
+override-map.2 = all-left,all-right
+
 [Element Headphone+LO]
 switch = mute
 volume = zero
diff --git a/src/modules/alsa/mixer/paths/analog-output-headphones.conf b/src/modules/alsa/mixer/paths/analog-output-headphones.conf
index 1c7611f..c808e19 100644
--- a/src/modules/alsa/mixer/paths/analog-output-headphones.conf
+++ b/src/modules/alsa/mixer/paths/analog-output-headphones.conf
@@ -93,6 +93,13 @@ volume = merge
 override-map.1 = all
 override-map.2 = all-left,all-right
 
+; This path is intended to control the first headphones, not
+; the second headphones. But it should not hurt if we leave the second
+; headphone jack enabled nonetheless.
+[Element Headphone,1]
+switch = mute
+volume = zero
+
 [Element Headset]
 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 61df499..1ffce22 100644
--- a/src/modules/alsa/mixer/paths/analog-output-lineout.conf
+++ b/src/modules/alsa/mixer/paths/analog-output-lineout.conf
@@ -127,6 +127,10 @@ required-any = any
 switch = off
 volume = off
 
+[Element Headphone,1]
+switch = off
+volume = off
+
 [Element Headphone2]
 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 9896543..5e49405 100644
--- a/src/modules/alsa/mixer/paths/analog-output-mono.conf
+++ b/src/modules/alsa/mixer/paths/analog-output-mono.conf
@@ -44,6 +44,10 @@ override-map.2 = all-left,all-right
 switch = mute
 volume = zero
 
+[Element Headphone,1]
+switch = mute
+volume = zero
+
 [Element Headphone+LO]
 switch = mute
 volume = zero
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 bf781c6..756afa9 100644
--- a/src/modules/alsa/mixer/paths/analog-output-speaker-always.conf
+++ b/src/modules/alsa/mixer/paths/analog-output-speaker-always.conf
@@ -76,6 +76,10 @@ volume = off
 switch = mute
 volume = zero
 
+[Element Headphone,1]
+switch = mute
+volume = zero
+
 [Element Headphone2]
 switch = mute
 volume = zero
diff --git a/src/modules/alsa/mixer/paths/analog-output-speaker.conf b/src/modules/alsa/mixer/paths/analog-output-speaker.conf
index 91a4bc1..72f928f 100644
--- a/src/modules/alsa/mixer/paths/analog-output-speaker.conf
+++ b/src/modules/alsa/mixer/paths/analog-output-speaker.conf
@@ -101,6 +101,10 @@ name = analog-output-speaker
 switch = off
 volume = off
 
+[Element Headphone,1]
+switch = off
+volume = off
+
 [Element Headphone2]
 switch = off
 volume = off