mirror of
				https://gitlab.freedesktop.org/pipewire/pipewire.git
				synced 2025-11-03 09:01:54 -05:00 
			
		
		
		
	media-session: load properties from config
This commit is contained in:
		
							parent
							
								
									85306917a2
								
							
						
					
					
						commit
						0bf1aa8f45
					
				
					 2 changed files with 9 additions and 4 deletions
				
			
		| 
						 | 
					@ -1,6 +1,10 @@
 | 
				
			||||||
# media-session config file
 | 
					# media-session config file
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
  properties = {
 | 
					  properties = {
 | 
				
			||||||
 | 
					    # Properties to configure the session and some
 | 
				
			||||||
 | 
					    # modules
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    #bluez5.msbc-support = true
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  spa-libs = {
 | 
					  spa-libs = {
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -2277,20 +2277,21 @@ int main(int argc, char *argv[])
 | 
				
			||||||
	pw_init(&argc, &argv);
 | 
						pw_init(&argc, &argv);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	impl.state_dir_fd = -1;
 | 
						impl.state_dir_fd = -1;
 | 
				
			||||||
 | 
						impl.this.props = pw_properties_new(NULL, NULL);
 | 
				
			||||||
 | 
						if (impl.this.props == NULL)
 | 
				
			||||||
 | 
							return -1;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	if ((impl.conf = pw_properties_new(NULL, NULL)) == NULL)
 | 
						if ((impl.conf = pw_properties_new(NULL, NULL)) == NULL)
 | 
				
			||||||
		return -1;
 | 
							return -1;
 | 
				
			||||||
	sm_media_session_load_conf(&impl.this, SESSION_CONF, impl.conf);
 | 
						sm_media_session_load_conf(&impl.this, SESSION_CONF, impl.conf);
 | 
				
			||||||
 | 
						if ((str = pw_properties_get(impl.conf, "properties")) != NULL)
 | 
				
			||||||
 | 
							pw_properties_update_string(impl.this.props, str, strlen(str));
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	if ((impl.modules = pw_properties_new("default", "true", NULL)) == NULL)
 | 
						if ((impl.modules = pw_properties_new("default", "true", NULL)) == NULL)
 | 
				
			||||||
		return -1;
 | 
							return -1;
 | 
				
			||||||
	if ((str = pw_properties_get(impl.conf, "modules")) != NULL)
 | 
						if ((str = pw_properties_get(impl.conf, "modules")) != NULL)
 | 
				
			||||||
		collect_modules(&impl, str);
 | 
							collect_modules(&impl, str);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	impl.this.props = pw_properties_new(NULL, NULL);
 | 
					 | 
				
			||||||
	if (impl.this.props == NULL)
 | 
					 | 
				
			||||||
		return -1;
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
	while ((c = getopt_long(argc, argv, "hVp:", long_options, NULL)) != -1) {
 | 
						while ((c = getopt_long(argc, argv, "hVp:", long_options, NULL)) != -1) {
 | 
				
			||||||
		switch (c) {
 | 
							switch (c) {
 | 
				
			||||||
		case 'h':
 | 
							case 'h':
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue