Changeset c78c4c64837adcb243297a79121ddff2e683e796

Timestamp:

04/05/10 04:18:24 (3 years ago)

Author:

Nedko Arnaudov <nedko@…>

Children:

c90661388fa42156b3c3b5787106af36ce47c7b2

Parents:

58db7cba75c98f293390d52a1477c9e9aed51db6

git-committer:

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

Message:

daemon: register virtualizer graph connection handlers for rooms

Location:

daemon

Files:

• graph.c (modified) (1 diff)
• studio.c (modified) (3 diffs)
• virtualizer.c (modified) (3 diffs)
• virtualizer.h (modified) (2 diffs)

daemon/graph.c

@@ -967 +967 @@
   ladish_graph_disconnect_request_handler disconnect_handler)
 {
+  log_info("setting connection handlers for graph '%s'", graph_ptr->opath != NULL ? graph_ptr->opath : "JACK");
   graph_ptr->context = graph_context;
   graph_ptr->connect_handler = connect_handler;

daemon/studio.c

@@ -227 +227 @@
 }
 
+bool
+set_graph_connection_handlers(
+  void * context,
+  ladish_graph_handle graph,
+  ladish_app_supervisor_handle app_supervisor)
+{
+  ladish_virtualizer_set_graph_connection_handlers(context, graph);
+  return true;                  /* iterate all graphs */
+}
+
 void on_event_jack_started(void)
 {
@@ -245 +255 @@
   else
   {
-    if (!ladish_virtualizer_create(g_studio.jack_graph_proxy, g_studio.jack_graph, g_studio.studio_graph, &g_studio.virtualizer))
+    if (!ladish_virtualizer_create(g_studio.jack_graph_proxy, g_studio.jack_graph, &g_studio.virtualizer))
     {
       log_error("ladish_virtualizer_create() failed.");
+    }
+    else
+    {
+      studio_iterate_virtual_graphs(g_studio.virtualizer, set_graph_connection_handlers);
     }
 
@@ -949 +963 @@
     lash_dbus_error(call_ptr, LASH_DBUS_ERROR_GENERIC, "ladish_room_create() failed.");
     goto fail_decrement_room_count;
+  }
+
+  if (g_studio.virtualizer != NULL)
+  {
+    ladish_virtualizer_set_graph_connection_handlers(g_studio.virtualizer, ladish_room_get_graph(room));
   }
 

daemon/virtualizer.c

@@ -802 +802 @@
   graph_proxy_handle jack_graph_proxy,
   ladish_graph_handle jack_graph,
-  ladish_graph_handle studio_graph,
   ladish_virtualizer_handle * handle_ptr)
 {
@@ -836 +835 @@
   }
 
-  ladish_graph_set_connection_handlers(studio_graph, virtualizer_ptr, ports_connect_request, ports_disconnect_request);
-
   *handle_ptr = (ladish_virtualizer_handle)virtualizer_ptr;
   return true;
@@ -843 +840 @@
 
 #define virtualizer_ptr ((struct virtualizer *)handle)
+
+void
+ladish_virtualizer_set_graph_connection_handlers(
+  ladish_virtualizer_handle handle,
+  ladish_graph_handle graph)
+{
+  ladish_graph_set_connection_handlers(graph, virtualizer_ptr, ports_connect_request, ports_disconnect_request);
+}
 
 unsigned int

daemon/virtualizer.h

@@ -3 +3 @@
  * LADI Session Handler (ladish)
  *
- * Copyright (C) 2009 Nedko Arnaudov <nedko@arnaudov.name>
+ * Copyright (C) 2009, 2010 Nedko Arnaudov <nedko@arnaudov.name>
  *
  **************************************************************************
@@ -38 +38 @@
   graph_proxy_handle jack_graph_proxy,
   ladish_graph_handle jack_graph,
-  ladish_graph_handle studio_graph,
   ladish_virtualizer_handle * handle_ptr);
+
+void
+ladish_virtualizer_set_graph_connection_handlers(
+  ladish_virtualizer_handle handle,
+  ladish_graph_handle graph);
 
 unsigned int