mirror of
				https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git
				synced 2025-11-03 09:01:50 -05:00 
			
		
		
		
	use the sink description instead of the name to choose the description for the monitor source
git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/glitch-free@2286 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
		
							parent
							
								
									64e048cb1b
								
							
						
					
					
						commit
						c2c833c068
					
				
					 1 changed files with 3 additions and 4 deletions
				
			
		| 
						 | 
					@ -124,10 +124,10 @@ pa_sink* pa_sink_new(
 | 
				
			||||||
        pa_sink_flags_t flags) {
 | 
					        pa_sink_flags_t flags) {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    pa_sink *s;
 | 
					    pa_sink *s;
 | 
				
			||||||
    char *d;
 | 
					 | 
				
			||||||
    const char *name;
 | 
					    const char *name;
 | 
				
			||||||
    char st[PA_SAMPLE_SPEC_SNPRINT_MAX], cm[PA_CHANNEL_MAP_SNPRINT_MAX];
 | 
					    char st[PA_SAMPLE_SPEC_SNPRINT_MAX], cm[PA_CHANNEL_MAP_SNPRINT_MAX];
 | 
				
			||||||
    pa_source_new_data source_data;
 | 
					    pa_source_new_data source_data;
 | 
				
			||||||
 | 
					    const char *dn;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    pa_assert(core);
 | 
					    pa_assert(core);
 | 
				
			||||||
    pa_assert(data);
 | 
					    pa_assert(data);
 | 
				
			||||||
| 
						 | 
					@ -235,9 +235,8 @@ pa_sink* pa_sink_new(
 | 
				
			||||||
    source_data.driver = data->driver;
 | 
					    source_data.driver = data->driver;
 | 
				
			||||||
    source_data.module = data->module;
 | 
					    source_data.module = data->module;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    d = pa_sprintf_malloc("Monitor Source of %s", s->name);
 | 
					    dn = pa_proplist_gets(s->proplist, PA_PROP_DEVICE_DESCRIPTION);
 | 
				
			||||||
    pa_proplist_sets(source_data.proplist, PA_PROP_DEVICE_DESCRIPTION, d);
 | 
					    pa_proplist_setf(source_data.proplist, PA_PROP_DEVICE_DESCRIPTION, "Monitor Source of %s", dn ? dn : s->name);
 | 
				
			||||||
    pa_xfree(d);
 | 
					 | 
				
			||||||
    pa_proplist_sets(source_data.proplist, PA_PROP_DEVICE_CLASS, "monitor");
 | 
					    pa_proplist_sets(source_data.proplist, PA_PROP_DEVICE_CLASS, "monitor");
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    s->monitor_source = pa_source_new(core, &source_data, 0);
 | 
					    s->monitor_source = pa_source_new(core, &source_data, 0);
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue