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

daemon: on studio stop, hide only non-virtual graph objects 

Representation of rooms in studio graph must not be hidden on server stop
This commit is contained in:
Nedko Arnaudov 2010-04-05 04:35:08 +03:00
parent c78c4c6483
commit c90661388f
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
daemon/cmd_stop_studio.c
View File

@ -144,8 +144,8 @@ static bool run(void * context)
done:
log_info("Wait for JACK server stop complete.");
ladish_graph_hide_all(g_studio.jack_graph);
ladish_graph_hide_all(g_studio.studio_graph);
ladish_graph_hide_non_virtual(g_studio.jack_graph);
ladish_graph_hide_non_virtual(g_studio.studio_graph);
ASSERT(!jack_server_started);
ladish_graph_dump(g_studio.studio_graph);

10
daemon/graph.c
View File

@ -1824,7 +1824,7 @@ void ladish_try_connect_hidden_connections(ladish_graph_handle graph_handle)
}
}
void ladish_graph_hide_all(ladish_graph_handle graph_handle)
void ladish_graph_hide_non_virtual(ladish_graph_handle graph_handle)
{
struct list_head * node_ptr;
struct ladish_graph_connection * connection_ptr;
@ -1836,7 +1836,9 @@ void ladish_graph_hide_all(ladish_graph_handle graph_handle)
list_for_each(node_ptr, &graph_ptr->connections)
{
connection_ptr = list_entry(node_ptr, struct ladish_graph_connection, siblings);
if (!connection_ptr->hidden)
if (!connection_ptr->hidden &&
(ladish_client_get_jack_id(connection_ptr->port1_ptr->client_ptr->client) != 0 ||
ladish_client_get_jack_id(connection_ptr->port2_ptr->client_ptr->client) != 0))
{
log_debug("hidding connection between ports %"PRIu64" and %"PRIu64, connection_ptr->port1_ptr->id, connection_ptr->port2_ptr->id);
ladish_graph_hide_connection_internal(graph_ptr, connection_ptr);
@ -1846,7 +1848,7 @@ void ladish_graph_hide_all(ladish_graph_handle graph_handle)
list_for_each(node_ptr, &graph_ptr->ports)
{
port_ptr = list_entry(node_ptr, struct ladish_graph_port, siblings_graph);
if (!port_ptr->hidden)
if (!port_ptr->hidden && ladish_client_get_jack_id(port_ptr->client_ptr->client) != 0)
{
ladish_port_set_jack_id(port_ptr->port, 0);
ladish_graph_hide_port_internal(graph_ptr, port_ptr);
@ -1856,7 +1858,7 @@ void ladish_graph_hide_all(ladish_graph_handle graph_handle)
list_for_each(node_ptr, &graph_ptr->clients)
{
client_ptr = list_entry(node_ptr, struct ladish_graph_client, siblings);
if (!client_ptr->hidden)
if (!client_ptr->hidden && ladish_client_get_jack_id(client_ptr->client) != 0)
{
ladish_client_set_jack_id(client_ptr->client, 0);
ladish_graph_hide_client_internal(graph_ptr, client_ptr);

2
daemon/graph.h
View File

@ -145,7 +145,7 @@ void ladish_graph_hide_client(ladish_graph_handle graph_handle, ladish_client_ha
void ladish_graph_adjust_port(ladish_graph_handle graph_handle, ladish_port_handle port_handle, uint32_t type, uint32_t flags);
void ladish_graph_show_connection(ladish_graph_handle graph_handle, uint64_t connection_id);
void ladish_try_connect_hidden_connections(ladish_graph_handle graph_handle);
void ladish_graph_hide_all(ladish_graph_handle graph_handle);
void ladish_graph_hide_non_virtual(ladish_graph_handle graph_handle);
void ladish_graph_dump(ladish_graph_handle graph_handle);