Changeset 9c01b375af29ec44d40f71a947f6415a7bfb60d8 for daemon/graph.c

Timestamp:

12/12/09 15:12:46 (3 years ago)

Author:

Nedko Arnaudov <nedko@…>

Children:

a10355eb4eeb8a9c94eab9e877fd976ea4b3a468

Parents:

6680478859a88f45843cf78407e747428974001d

git-committer:

Nedko Arnaudov <nedko@arnaudov.name> / 2009-12-12T15:12:46Z+0200

Message:

daemon: show client when adding non-hidden port

Files:

• daemon/graph.c (modified) (4 diffs)

daemon/graph.c

@@ -736 +736 @@
 }
 
+void ladish_graph_show_port_internal(struct ladish_graph * graph_ptr, struct ladish_graph_port * port_ptr)
+{
+  if (port_ptr->client_ptr->hidden)
+  {
+    port_ptr->client_ptr->hidden = false;
+    graph_ptr->graph_version++;
+    if (graph_ptr->opath != NULL)
+    {
+      dbus_signal_emit(
+        g_dbus_connection,
+        graph_ptr->opath,
+        JACKDBUS_IFACE_PATCHBAY,
+        "ClientAppeared",
+        "tts",
+        &graph_ptr->graph_version,
+        &port_ptr->client_ptr->id,
+        &port_ptr->client_ptr->name);
+    }
+  }
+
+  ASSERT(port_ptr->hidden);
+  port_ptr->hidden = false;
+  graph_ptr->graph_version++;
+  if (graph_ptr->opath != NULL)
+  {
+    dbus_signal_emit(
+      g_dbus_connection,
+      graph_ptr->opath,
+      JACKDBUS_IFACE_PATCHBAY,
+      "PortAppeared",
+      "ttstsuu",
+      &graph_ptr->graph_version,
+      &port_ptr->client_ptr->id,
+      &port_ptr->client_ptr->name,
+      &port_ptr->id,
+      &port_ptr->name,
+      &port_ptr->flags,
+      &port_ptr->type);
+
+    ladish_try_connect_hidden_connections((ladish_graph_handle)graph_ptr);
+  }
+}
+
 void ladish_graph_hide_port_internal(struct ladish_graph * graph_ptr, struct ladish_graph_port * port_ptr)
 {
@@ -1011 +1054 @@
   //log_info("port '%s' is %s", port_ptr->name, port_ptr->hidden ? "invisible" : "visible");
 
-  if (port_ptr->client_ptr->hidden)
-  {
-    port_ptr->client_ptr->hidden = false;
-    graph_ptr->graph_version++;
-    if (graph_ptr->opath != NULL)
-    {
-      dbus_signal_emit(
-        g_dbus_connection,
-        graph_ptr->opath,
-        JACKDBUS_IFACE_PATCHBAY,
-        "ClientAppeared",
-        "tts",
-        &graph_ptr->graph_version,
-        &port_ptr->client_ptr->id,
-        &port_ptr->client_ptr->name);
-    }
-  }
-
-  ASSERT(port_ptr->hidden);
-  port_ptr->hidden = false;
-  graph_ptr->graph_version++;
-  if (graph_ptr->opath != NULL)
-  {
-    dbus_signal_emit(
-      g_dbus_connection,
-      graph_ptr->opath,
-      JACKDBUS_IFACE_PATCHBAY,
-      "PortAppeared",
-      "ttstsuu",
-      &graph_ptr->graph_version,
-      &port_ptr->client_ptr->id,
-      &port_ptr->client_ptr->name,
-      &port_ptr->id,
-      &port_ptr->name,
-      &port_ptr->flags,
-      &port_ptr->type);
-
-    ladish_try_connect_hidden_connections(graph_handle);
-  }
+  ladish_graph_show_port_internal(graph_ptr, port_ptr);
 }
 
@@ -1251 +1256 @@
   port_ptr->id = graph_ptr->next_port_id++;
   port_ptr->port = port_handle;
-  port_ptr->hidden = hidden;
-  graph_ptr->graph_version++;
+  port_ptr->hidden = true;
 
   port_ptr->client_ptr = client_ptr;
@@ -1258 +1262 @@
   list_add_tail(&port_ptr->siblings_graph, &graph_ptr->ports);
 
-  if (!hidden && graph_ptr->opath != NULL)
-  {
-    dbus_signal_emit(
-      g_dbus_connection,
-      graph_ptr->opath,
-      JACKDBUS_IFACE_PATCHBAY,
-      "PortAppeared",
-      "ttstsuu",
-      &graph_ptr->graph_version,
-      &client_ptr->id,
-      &client_ptr->name,
-      &port_ptr->id,
-      &port_ptr->name,
-      &flags,
-      &type);
+  if (!hidden)
+  {
+    ladish_graph_show_port_internal(graph_ptr, port_ptr);
   }