mirror of
				https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git
				synced 2025-11-02 09:01:46 -05:00 
			
		
		
		
	don't put both the card and the pcm name in the description of a device if one contains the other
This commit is contained in:
		
							parent
							
								
									ba3c7668a4
								
							
						
					
					
						commit
						03ac71bcad
					
				
					 1 changed files with 3 additions and 3 deletions
				
			
		| 
						 | 
				
			
			@ -1448,9 +1448,9 @@ void pa_alsa_init_proplist_pcm_info(pa_core *c, pa_proplist *p, snd_pcm_info_t *
 | 
			
		|||
        cn = pa_proplist_gets(p, "alsa.card_name");
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    if (cn && n)
 | 
			
		||||
        pa_proplist_setf(p, PA_PROP_DEVICE_DESCRIPTION, "%s - %s", cn, n);
 | 
			
		||||
    else if (cn)
 | 
			
		||||
    if (cn && n && !strstr(cn, n) && !strstr(n, cn))
 | 
			
		||||
        pa_proplist_setf(p, PA_PROP_DEVICE_DESCRIPTION, "%s, %s", cn, n);
 | 
			
		||||
    else if (cn && (!n || strstr(cn, n)))
 | 
			
		||||
        pa_proplist_sets(p, PA_PROP_DEVICE_DESCRIPTION, cn);
 | 
			
		||||
    else if (n)
 | 
			
		||||
        pa_proplist_sets(p, PA_PROP_DEVICE_DESCRIPTION, n);
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue