acp: update to latest

spa/plugins/alsa/mixer/paths/analog-output-headphones-2.conf

@@ -13,17 +13,24 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 
-; Path for mixers that have a 'Headphone2' control
+; Path for the second headphone output on dual-headphone machines.
 ;
 ; See analog-output.conf.common for an explanation on the directives
 
 [General]
 priority = 98
-description-key = analog-output-headphones
 
 [Properties]
 device.icon_name = audio-headphones
 
+; HP EliteDesk 800 SFF Headphone
+[Jack Front Headphone,1]
+required-any = any
+
+; HP EliteDesk 800 DM Headphone
+[Jack Front Headphone Surround]
+required-any = any
+
 [Element Hardware Master]
 switch = mute
 volume = merge
@@ -47,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
@@ -56,7 +70,7 @@ switch = off
 volume = off
 
 [Element Headphone2]
-required = any
+required-any = any
 switch = mute
 volume = merge
 override-map.1 = all

spa/plugins/alsa/mixer/paths/analog-output-headphones.conf

@@ -35,6 +35,10 @@ state.unplugged = unknown
 [Jack Front Headphone]
 required-any = any
 
+; HP EliteDesk 800 DM Headset
+[Jack Front Headphone Front]
+required-any = any
+
 [Jack Front Headphone Phantom]
 required-any = any
 state.plugged = unknown
@@ -89,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

spa/plugins/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

spa/plugins/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

spa/plugins/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

spa/plugins/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

spa/plugins/alsa/mixer/profile-sets/native-instruments-traktorkontrol-s4.conf

@@ -77,3 +77,4 @@ description = Analog Stereo Input Channel D
 input-mappings = analog-stereo-d-input
 priority = 1
 skip-probe = yes
+