mirror of
				https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git
				synced 2025-11-03 09:01:50 -05:00 
			
		
		
		
	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>
This commit is contained in:
		
							parent
							
								
									0c14f89b84
								
							
						
					
					
						commit
						21a531041a
					
				
					 6 changed files with 30 additions and 0 deletions
				
			
		| 
						 | 
				
			
			@ -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
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -127,6 +127,10 @@ required-any = any
 | 
			
		|||
switch = off
 | 
			
		||||
volume = off
 | 
			
		||||
 | 
			
		||||
[Element Headphone,1]
 | 
			
		||||
switch = off
 | 
			
		||||
volume = off
 | 
			
		||||
 | 
			
		||||
[Element Headphone2]
 | 
			
		||||
switch = off
 | 
			
		||||
volume = off
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -76,6 +76,10 @@ volume = off
 | 
			
		|||
switch = mute
 | 
			
		||||
volume = zero
 | 
			
		||||
 | 
			
		||||
[Element Headphone,1]
 | 
			
		||||
switch = mute
 | 
			
		||||
volume = zero
 | 
			
		||||
 | 
			
		||||
[Element Headphone2]
 | 
			
		||||
switch = mute
 | 
			
		||||
volume = zero
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue