mirror of
				https://gitlab.freedesktop.org/pipewire/pipewire.git
				synced 2025-11-03 09:01:54 -05:00 
			
		
		
		
	jack: rename a function
Add/remove_link is more what this function does.
This commit is contained in:
		
							parent
							
								
									fa154955af
								
							
						
					
					
						commit
						05abc4e41f
					
				
					 1 changed files with 5 additions and 5 deletions
				
			
		| 
						 | 
				
			
			@ -2929,7 +2929,7 @@ exit:
 | 
			
		|||
}
 | 
			
		||||
 | 
			
		||||
static int
 | 
			
		||||
do_activate_link(struct spa_loop *loop,
 | 
			
		||||
do_add_link(struct spa_loop *loop,
 | 
			
		||||
                bool async, uint32_t seq, const void *data, size_t size, void *user_data)
 | 
			
		||||
{
 | 
			
		||||
	struct link *link = user_data;
 | 
			
		||||
| 
						 | 
				
			
			@ -2940,7 +2940,7 @@ do_activate_link(struct spa_loop *loop,
 | 
			
		|||
}
 | 
			
		||||
 | 
			
		||||
static int
 | 
			
		||||
do_deactivate_link(struct spa_loop *loop,
 | 
			
		||||
do_remove_link(struct spa_loop *loop,
 | 
			
		||||
                bool async, uint32_t seq, const void *data, size_t size, void *user_data)
 | 
			
		||||
{
 | 
			
		||||
	struct link *link = user_data;
 | 
			
		||||
| 
						 | 
				
			
			@ -3000,7 +3000,7 @@ static int client_node_set_activation(void *data,
 | 
			
		|||
		spa_list_append(&c->links, &link->link);
 | 
			
		||||
 | 
			
		||||
		pw_data_loop_invoke(c->loop,
 | 
			
		||||
                       do_activate_link, SPA_ID_INVALID, NULL, 0, false, link);
 | 
			
		||||
                       do_add_link, SPA_ID_INVALID, NULL, 0, false, link);
 | 
			
		||||
	}
 | 
			
		||||
	else {
 | 
			
		||||
		link = find_activation(&c->links, node_id);
 | 
			
		||||
| 
						 | 
				
			
			@ -3011,7 +3011,7 @@ static int client_node_set_activation(void *data,
 | 
			
		|||
		spa_list_remove(&link->link);
 | 
			
		||||
 | 
			
		||||
		pw_data_loop_invoke(c->loop,
 | 
			
		||||
                       do_deactivate_link, SPA_ID_INVALID, NULL, 0, false, link);
 | 
			
		||||
                       do_remove_link, SPA_ID_INVALID, NULL, 0, false, link);
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	if (c->driver_id == node_id)
 | 
			
		||||
| 
						 | 
				
			
			@ -5973,7 +5973,7 @@ static int check_connect(struct client *c, struct object *src, struct object *ds
 | 
			
		|||
	dst_self = dst->port.node_id == c->node_id ? 1 : 0;
 | 
			
		||||
	sum = src_self + dst_self;
 | 
			
		||||
 | 
			
		||||
	pw_log_info("sum %d %d", sum, c->self_connect_mode);
 | 
			
		||||
	pw_log_debug("sum %d %d", sum, c->self_connect_mode);
 | 
			
		||||
 | 
			
		||||
	/* check for other connection first */
 | 
			
		||||
	if (sum == 0)
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue