mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-07 13:30:03 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
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>
This commit is contained in:
Tanu Kaskinen 2020-12-26 22:22:06 +02:00 • committed by PulseAudio Marge Bot
parent d51870d4f0
commit 0c14f89b84
2 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/modules/alsa/mixer/paths/analog-output-headphones-2.conf
View file

@ -13,7 +13,7 @@
# You should have received a copy of the GNU Lesser General Public License # You should have received a copy of the GNU Lesser General Public License
# along with PulseAudio; if not, see <http://www.gnu.org/licenses/>. # 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 ; See analog-output.conf.common for an explanation on the directives
@ -23,6 +23,14 @@ priority = 98
[Properties] [Properties]
device.icon_name = audio-headphones 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] [Element Hardware Master]
switch = mute switch = mute
volume = merge volume = merge
@ -55,7 +63,7 @@ switch = off
volume = off volume = off
[Element Headphone2] [Element Headphone2]
required = any required-any = any
switch = mute switch = mute
volume = merge volume = merge
override-map.1 = all override-map.1 = all

8
src/modules/alsa/mixer/paths/analog-output-headphones.conf
View file

@ -35,18 +35,10 @@ state.unplugged = unknown
[Jack Front Headphone] [Jack Front Headphone]
required-any = any required-any = any
; HP EliteDesk 800 SFF Headphone
[Jack Front Headphone,1]
required-any = any
; HP EliteDesk 800 DM Headset ; HP EliteDesk 800 DM Headset
[Jack Front Headphone Front] [Jack Front Headphone Front]
required-any = any required-any = any
; HP EliteDesk 800 DM Headphone
[Jack Front Headphone Surround]
required-any = any
[Jack Front Headphone Phantom] [Jack Front Headphone Phantom]
required-any = any required-any = any
state.plugged = unknown state.plugged = unknown