Changeset c90661388fa42156b3c3b5787106af36ce47c7b2

Timestamp:

04/05/10 04:35:08 (3 years ago)

Author:

Nedko Arnaudov <nedko@…>

Children:

ef08b85792e6f41ce0f14e44c93487056f56047a

Parents:

c78c4c64837adcb243297a79121ddff2e683e796

git-committer:

Nedko Arnaudov <nedko@arnaudov.name> / 2010-04-05T04:35:08Z+0300

Message:

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

Representation of rooms in studio graph must not be hidden on server stop

Location:

daemon

Files:

• cmd_stop_studio.c (modified) (1 diff)
• graph.c (modified) (4 diffs)
• graph.h (modified) (1 diff)

daemon/cmd_stop_studio.c

@@ -145 +145 @@
     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);
 

daemon/graph.c

@@ -1825 +1825 @@
 }
 
-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;
@@ -1837 +1837 @@
   {
     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);
@@ -1847 +1849 @@
   {
     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);
@@ -1857 +1859 @@
   {
     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);

daemon/graph.h

@@ -146 +146 @@
 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);