Changeset 2fd730ea55ee6a1df6b457076c67e4a8edae0580

Timestamp:

03/06/10 17:03:14 (5 months ago)

Author:

Nedko Arnaudov <nedko@…>

Children:

a459a2a19cd0f110f245f6c1cbf0a39f6f2a6dad

Parents:

a76c415981c63ef0bffe8be7e81ecde70ef3e2fd

git-committer:

Nedko Arnaudov <nedko@arnaudov.name> / 2010-03-06T17:03:14Z+0200

Message:

daemon: expose new studio room objects on D-Bus

Location:

daemon

Files:

• control.c (modified) (2 diffs)
• graph.c (modified) (2 diffs)
• graph.h (modified) (2 diffs)
• room.c (modified) (7 diffs)
• room.h (modified) (2 diffs)
• studio.c (modified) (7 diffs)
• studio_internal.h (modified) (2 diffs)

daemon/control.c

@@ -49 +49 @@
   ladish_room_handle room;
 
-  if (!ladish_room_create(empty_room, "Empty", NULL, &room))
+  if (!ladish_room_create(empty_room, "Empty", NULL, NULL, &room))
   {
     log_error("ladish_room_create() failed.");
@@ -57 +57 @@
   list_add_tail(ladish_room_get_list_node(room), &g_rooms);
 
-  if (!ladish_room_create(basic_room, "Basic", NULL, &room))
+  if (!ladish_room_create(basic_room, "Basic", NULL, NULL, &room))
   {
     log_error("ladish_room_create() failed.");

daemon/graph.c

@@ -3 +3 @@
  * LADI Session Handler (ladish)
  *
- * Copyright (C) 2008, 2009 Nedko Arnaudov <nedko@arnaudov.name>
+ * Copyright (C) 2008, 2009, 2010 Nedko Arnaudov <nedko@arnaudov.name>
  * Copyright (C) 2008 Juuso Alasuutari
  *
@@ -958 +958 @@
   }
   free(graph_ptr);
+}
+
+const char * ladish_graph_get_opath(ladish_graph_handle graph_handle)
+{
+  return graph_ptr->opath;
 }
 

daemon/graph.h

@@ -3 +3 @@
  * LADI Session Handler (ladish)
  *
- * Copyright (C) 2009 Nedko Arnaudov <nedko@arnaudov.name>
+ * Copyright (C) 2009, 2010 Nedko Arnaudov <nedko@arnaudov.name>
  *
  **************************************************************************
@@ -50 +50 @@
 bool ladish_graph_create(ladish_graph_handle * graph_handle_ptr, const char * opath);
 void ladish_graph_destroy(ladish_graph_handle graph_handle, bool destroy_ports);
+
+const char * ladish_graph_get_opath(ladish_graph_handle graph_handle);
 
 void

daemon/room.c

@@ -26 +26 @@
 
 #include "room.h"
+#include "../dbus_constants.h"
+#include "graph.h"
+#include "graph_dict.h"
 
 struct ladish_room
@@ -33 +36 @@
   char * name;
   uuid_t template_uuid;
+  dbus_object_path dbus_object;
+  ladish_graph_handle graph;
 };
+
+extern const struct dbus_interface_descriptor g_interface_room;
 
 bool
@@ -40 +47 @@
   const char * name,
   ladish_room_handle template,
+  const char * object_path,
   ladish_room_handle * room_handle_ptr)
 {
@@ -84 +92 @@
   }
 
+  if (object_path)
+  {
+    if (!ladish_graph_create(&room_ptr->graph, object_path))
+    {
+      free(room_ptr);
+      return false;
+    }
+
+    room_ptr->dbus_object = dbus_object_path_new(
+      object_path,
+      &g_interface_room, room_ptr,
+      &g_interface_patchbay, ladish_graph_get_dbus_context(room_ptr->graph),
+      &g_iface_graph_dict, room_ptr->graph,
+      //&g_iface_app_supervisor, room_ptr->app_supervisor,
+      NULL);
+    if (room_ptr->dbus_object == NULL)
+    {
+      log_error("dbus_object_path_new() failed");
+      ladish_graph_destroy(room_ptr->graph, true);
+      free(room_ptr);
+      return false;
+    }
+
+    if (!dbus_object_path_register(g_dbus_connection, room_ptr->dbus_object))
+    {
+      log_error("object_path_register() failed");
+      dbus_object_path_destroy(g_dbus_connection, room_ptr->dbus_object);
+      ladish_graph_destroy(room_ptr->graph, true);
+      free(room_ptr);
+      return false;
+    }
+
+    log_info("D-Bus object \"%s\" created for room \"%s\".", object_path, room_ptr->name);
+  }
+  else
+  {
+    room_ptr->dbus_object = NULL;
+    room_ptr->graph = NULL;
+  }
+
   *room_handle_ptr = (ladish_room_handle)room_ptr;
   return true;
@@ -94 +142 @@
   ladish_room_handle room_handle)
 {
+  if (room_ptr->dbus_object != NULL)
+  {
+    dbus_object_path_destroy(g_dbus_connection, room_ptr->dbus_object);
+    ladish_graph_destroy(room_ptr->graph, true);
+  }
+
   free(room_ptr->name);
   free(room_ptr);
@@ -108 +162 @@
 }
 
+const char * ladish_room_get_opath(ladish_room_handle room_handle)
+{
+  if (room_ptr->graph == NULL)
+  {
+    return NULL;
+  }
+
+  return ladish_graph_get_opath(room_ptr->graph);
+}
+
 bool ladish_room_get_template_uuid(ladish_room_handle room_handle, uuid_t uuid_ptr)
 {
@@ -130 +194 @@
   return (ladish_room_handle)list_entry(node_ptr, struct ladish_room, siblings);
 }
+
+#define room_ptr ((struct ladish_room *)call_ptr->iface_context)
+
+static void ladish_get_room_name(struct dbus_method_call * call_ptr)
+{
+  method_return_new_single(call_ptr, DBUS_TYPE_STRING, &room_ptr->name);
+}
+
+#undef room_ptr
+
+METHOD_ARGS_BEGIN(GetName, "Get room name")
+  METHOD_ARG_DESCRIBE_OUT("room_name", "s", "Name of room")
+METHOD_ARGS_END
+
+METHODS_BEGIN
+  METHOD_DESCRIBE(GetName, ladish_get_room_name)
+METHODS_END
+
+SIGNALS_BEGIN
+SIGNALS_END
+
+INTERFACE_BEGIN(g_interface_room, IFACE_ROOM)
+  INTERFACE_DEFAULT_HANDLER
+  INTERFACE_EXPOSE_METHODS
+  INTERFACE_EXPOSE_SIGNALS
+INTERFACE_END

daemon/room.h

@@ -37 +37 @@
   const char * name,
   ladish_room_handle template,
+  const char * object_path,
   ladish_room_handle * room_handle_ptr);
 
@@ -47 +48 @@
 
 const char * ladish_room_get_name(ladish_room_handle room_handle);
+const char * ladish_room_get_opath(ladish_room_handle room_handle);
 bool ladish_room_get_template_uuid(ladish_room_handle room_handle, uuid_t uuid_ptr);
 void ladish_room_get_uuid(ladish_room_handle room_handle, uuid_t uuid_ptr);

daemon/studio.c

@@ -329 +329 @@
   g_studio.filename = NULL;
 
+  g_studio.room_count = 0;
+
   if (!ladish_graph_create(&g_studio.jack_graph, NULL))
   {
@@ -701 +703 @@
   const char * template_name;
   ladish_room_handle room;
+  char room_dbus_name[1024];
+  const char * arg;
 
   dbus_error_init(&g_dbus_error);
@@ -720 +724 @@
   }
 
-  if (!ladish_room_create(NULL, room_name, room, &room))
+  g_studio.room_count++;
+
+  sprintf(room_dbus_name, DBUS_BASE_PATH "/Room%u", g_studio.room_count);
+
+  if (!ladish_room_create(NULL, room_name, room, room_dbus_name, &room))
   {
     lash_dbus_error(call_ptr, LASH_DBUS_ERROR_GENERIC, "ladish_room_create() failed.");
+    g_studio.room_count--;
     return;
   }
@@ -728 +737 @@
   list_add_tail(ladish_room_get_list_node(room), &g_studio.rooms);
 
-  //dbus_signal_emit(g_dbus_connection, STUDIO_OBJECT_PATH, IFACE_STUDIO, "RoomAppeared", "");
+  arg = room_dbus_name;
+  dbus_signal_emit(g_dbus_connection, STUDIO_OBJECT_PATH, IFACE_STUDIO, "RoomAppeared", "s", &arg);
 
   method_return_new_void(call_ptr);
@@ -744 +754 @@
   ladish_room_handle template;
   const char * template_name;
+  const char * opath;
 
   call_ptr->reply = dbus_message_new_method_return(call_ptr->message);
@@ -762 +773 @@
     room = ladish_room_from_list_node(node_ptr);
     name = ladish_room_get_name(room);
+    opath = ladish_room_get_opath(room);
 
     if (!ladish_room_get_template_uuid(room, template_uuid))
@@ -791 +803 @@
 
     if (!dbus_maybe_add_dict_entry_string(&dict_iter, "template", template_name))
+      goto fail_unref;
+
+    if (!dbus_maybe_add_dict_entry_string(&dict_iter, "opath", opath))
       goto fail_unref;
 

daemon/studio_internal.h

@@ -3 +3 @@
  * LADI Session Handler (ladish)
  *
- * Copyright (C) 2009 Nedko Arnaudov <nedko@arnaudov.name>
+ * Copyright (C) 2009, 2010 Nedko Arnaudov <nedko@arnaudov.name>
  *
  **************************************************************************
@@ -152 +152 @@
   ladish_virtualizer_handle virtualizer;
   ladish_app_supervisor_handle app_supervisor;
+
+  unsigned int room_count;
 };