alsa-mixer: Move HP EliteDesk 800 SFF/DM second headphone output to path analog-outpu...

The two headphone outputs should be handled in separate paths so that
volume control can be implemented properly for both outputs.

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 33f1cfd..f88f8a0 100644 (file)
--- a/src/modules/alsa/mixer/paths/analog-output-headphones-2.conf
+++ b/src/modules/alsa/mixer/paths/analog-output-headphones-2.conf
@@ -13,7 +13,7 @@
 # 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
 
@@ -23,6 +23,14 @@ priority = 98
 [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
@@ -55,7 +63,7 @@ switch = off
 volume = off
 
 [Element Headphone2]
-required = any
+required-any = any
 switch = mute
 volume = merge
 override-map.1 = all

diff --git a/src/modules/alsa/mixer/paths/analog-output-headphones.conf b/src/modules/alsa/mixer/paths/analog-output-headphones.conf
index d5a9a32..1c7611f 100644 (file)
--- a/src/modules/alsa/mixer/paths/analog-output-headphones.conf
+++ b/src/modules/alsa/mixer/paths/analog-output-headphones.conf
@@ -35,18 +35,10 @@ state.unplugged = unknown
 [Jack Front Headphone]
 required-any = any
 
-; HP EliteDesk 800 SFF Headphone
-[Jack Front Headphone,1]
-required-any = any
-
 ; HP EliteDesk 800 DM Headset
 [Jack Front Headphone Front]
 required-any = any
 
-; HP EliteDesk 800 DM Headphone
-[Jack Front Headphone Surround]
-required-any = any
-
 [Jack Front Headphone Phantom]
 required-any = any
 state.plugged = unknown