mirror of
				https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git
				synced 2025-11-03 09:01:50 -05:00 
			
		
		
		
	alsa: use default output port names
instead of coming up with pointless aliases, reuse the already established names, for second headphones, and second speakers.
This commit is contained in:
		
							parent
							
								
									0c836aacd8
								
							
						
					
					
						commit
						307bd142fe
					
				
					 5 changed files with 5 additions and 3 deletions
				
			
		| 
						 | 
					@ -1783,9 +1783,7 @@ static int path_verify(pa_alsa_path *p) {
 | 
				
			||||||
        { "analog-output-headphones",   N_("Analog Headphones") },
 | 
					        { "analog-output-headphones",   N_("Analog Headphones") },
 | 
				
			||||||
        { "analog-output-lfe-on-mono",  N_("Analog Output (LFE)") },
 | 
					        { "analog-output-lfe-on-mono",  N_("Analog Output (LFE)") },
 | 
				
			||||||
        { "analog-output-mono",         N_("Analog Mono Output") },
 | 
					        { "analog-output-mono",         N_("Analog Mono Output") },
 | 
				
			||||||
        { "analog-output-headphones-2", N_("Analog Headphones 2") },
 | 
					 | 
				
			||||||
        { "analog-output-speaker",      N_("Analog Speakers") }
 | 
					        { "analog-output-speaker",      N_("Analog Speakers") }
 | 
				
			||||||
        { "analog-output-desktop-speaker", N_("Analog Speakers 2") }
 | 
					 | 
				
			||||||
    };
 | 
					    };
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    pa_alsa_element *e;
 | 
					    pa_alsa_element *e;
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -19,7 +19,8 @@
 | 
				
			||||||
; See analog-output.conf.common for an explanation on the directives
 | 
					; See analog-output.conf.common for an explanation on the directives
 | 
				
			||||||
 | 
					
 | 
				
			||||||
[General]
 | 
					[General]
 | 
				
			||||||
priority = 100
 | 
					priority = 101
 | 
				
			||||||
 | 
					name = analog-output-speaker
 | 
				
			||||||
 | 
					
 | 
				
			||||||
[Element Hardware Master]
 | 
					[Element Hardware Master]
 | 
				
			||||||
switch = mute
 | 
					switch = mute
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -20,6 +20,7 @@
 | 
				
			||||||
 | 
					
 | 
				
			||||||
[General]
 | 
					[General]
 | 
				
			||||||
priority = 89
 | 
					priority = 89
 | 
				
			||||||
 | 
					name = analog-output-headphones
 | 
				
			||||||
 | 
					
 | 
				
			||||||
[Element Hardware Master]
 | 
					[Element Hardware Master]
 | 
				
			||||||
switch = mute
 | 
					switch = mute
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -20,6 +20,7 @@
 | 
				
			||||||
 | 
					
 | 
				
			||||||
[General]
 | 
					[General]
 | 
				
			||||||
priority = 90
 | 
					priority = 90
 | 
				
			||||||
 | 
					name = analog-output-headphones
 | 
				
			||||||
 | 
					
 | 
				
			||||||
[Element Hardware Master]
 | 
					[Element Hardware Master]
 | 
				
			||||||
switch = mute
 | 
					switch = mute
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -20,6 +20,7 @@
 | 
				
			||||||
 | 
					
 | 
				
			||||||
[General]
 | 
					[General]
 | 
				
			||||||
priority = 100
 | 
					priority = 100
 | 
				
			||||||
 | 
					name = analog-output-speaker
 | 
				
			||||||
 | 
					
 | 
				
			||||||
[Element Hardware Master]
 | 
					[Element Hardware Master]
 | 
				
			||||||
switch = mute
 | 
					switch = mute
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue