LADI
/
ladish
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

daemon: remove room client connections in studio graph. Fix #89 

When room client in studio graph is being destroyed of room being destroyed,
connections for this client need to be destroyed as well.
This commit is contained in:
Nedko Arnaudov 2010-05-10 20:40:53 +03:00
parent e78efac7e6
commit 9a42d3d998
2 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
daemon/cmd_delete_room.c
View File

@ -145,6 +145,9 @@ found:
ladish_room_destroy(room);
ladish_graph_dump(g_studio.studio_graph);
ladish_graph_dump(g_studio.jack_graph);
cmd_ptr->command.state = LADISH_COMMAND_STATE_DONE;
return true;
}

19
daemon/graph.c
View File

@ -906,6 +906,23 @@ static void ladish_graph_remove_connection_internal(struct ladish_graph * graph_
free(connection_ptr);
}
static void ladish_graph_remove_port_connections(struct ladish_graph * graph_ptr, struct ladish_graph_port * port_ptr)
{
struct list_head * node_ptr;
struct list_head * temp_node_ptr;
struct ladish_graph_connection * connection_ptr;
list_for_each_safe(node_ptr, temp_node_ptr, &graph_ptr->connections)
{
connection_ptr = list_entry(node_ptr, struct ladish_graph_connection, siblings);
if (connection_ptr->port1_ptr == port_ptr || connection_ptr->port2_ptr == port_ptr)
{
log_info("removing connection between ports %"PRIu64" and %"PRIu64, connection_ptr->port1_ptr->id, connection_ptr->port2_ptr->id);
ladish_graph_remove_connection_internal(graph_ptr, connection_ptr);
}
}
}
static
void
ladish_graph_remove_port_internal(
@ -913,6 +930,8 @@ ladish_graph_remove_port_internal(
struct ladish_graph_client * client_ptr,
struct ladish_graph_port * port_ptr)
{
ladish_graph_remove_port_connections(graph_ptr, port_ptr);
ladish_port_del_ref(port_ptr->port);
list_del(&port_ptr->siblings_client);