Changeset 1f11f0968ec78d2ee1ae73c6604e2637725adf86

Timestamp:

03/07/10 13:46:45 (5 months ago)

Author:

Nedko Arnaudov <nedko@…>

Children:

3abed82be77c9f7efdc2dc5a20ca1e2d5672e3ff

Parents:

e154c89ce313738b3356c116c83148b5b3044ce2

git-committer:

Nedko Arnaudov <nedko@arnaudov.name> / 2010-03-07T13:46:45Z+0200

Message:

Fix studio room signal parameters; Add RoomChanged? signal

Files:

• daemon/studio.c (modified) (7 diffs)

daemon/studio.c

@@ -119 +119 @@
 }
 
+static bool fill_room_info(DBusMessageIter * iter_ptr, ladish_room_handle room)
+{
+  DBusMessageIter dict_iter;
+  const char * name;
+  uuid_t template_uuid;
+  ladish_room_handle template;
+  const char * template_name;
+  const char * opath;
+
+  name = ladish_room_get_name(room);
+  opath = ladish_room_get_opath(room);
+
+  if (!ladish_room_get_template_uuid(room, template_uuid))
+  {
+    template = NULL;
+    template_name = NULL;
+  }
+  else
+  {
+    template = find_room_template_by_uuid(template_uuid);
+    if (template != NULL)
+    {
+      template_name = ladish_room_get_name(template);
+    }
+    else
+    {
+      template_name = NULL;
+    }
+  }
+
+  if (!dbus_message_iter_append_basic(iter_ptr, DBUS_TYPE_STRING, &opath))
+  {
+    log_error("dbus_message_iter_append_basic() failed.");
+    return false;
+  }
+
+  if (!dbus_message_iter_open_container(iter_ptr, DBUS_TYPE_ARRAY, "{sv}", &dict_iter))
+  {
+    log_error("dbus_message_iter_open_container() failed.");
+    return false;
+  }
+
+  if (!dbus_maybe_add_dict_entry_string(&dict_iter, "template", template_name))
+  {
+    log_error("dbus_maybe_add_dict_entry_string() failed.");
+    return false;
+  }
+
+  if (!dbus_maybe_add_dict_entry_string(&dict_iter, "name", name))
+  {
+    log_error("dbus_maybe_add_dict_entry_string() failed.");
+    return false;
+  }
+
+  if (!dbus_message_iter_close_container(iter_ptr, &dict_iter))
+  {
+    log_error("dbus_message_iter_close_container() failed.");
+    return false;
+  }
+
+  return true;
+}
+
+static void emit_room_appeared(ladish_room_handle room)
+{
+  DBusMessage * message_ptr;
+  DBusMessageIter iter;
+
+  message_ptr = dbus_message_new_signal(STUDIO_OBJECT_PATH, IFACE_STUDIO, "RoomAppeared");
+  if (message_ptr == NULL)
+  {
+    log_error("dbus_message_new_signal() failed.");
+    return;
+  }
+
+  dbus_message_iter_init_append(message_ptr, &iter);
+
+  if (fill_room_info(&iter, room))
+  {
+    dbus_signal_send(g_dbus_connection, message_ptr);
+  }
+
+  dbus_message_unref(message_ptr);
+}
+
 void on_event_jack_started(void)
 {
@@ -704 +789 @@
   ladish_room_handle room;
   char room_dbus_name[1024];
-  const char * arg;
 
   dbus_error_init(&g_dbus_error);
@@ -737 +821 @@
   list_add_tail(ladish_room_get_list_node(room), &g_studio.rooms);
 
-  arg = room_dbus_name;
-  dbus_signal_emit(g_dbus_connection, STUDIO_OBJECT_PATH, IFACE_STUDIO, "RoomAppeared", "s", &arg);
+  emit_room_appeared(room);
 
   method_return_new_void(call_ptr);
@@ -747 +830 @@
   DBusMessageIter iter, array_iter;
   DBusMessageIter struct_iter;
-  DBusMessageIter dict_iter;
   struct list_head * node_ptr;
   ladish_room_handle room;
-  const char * name;
-  uuid_t template_uuid;
-  ladish_room_handle template;
-  const char * template_name;
-  const char * opath;
 
   call_ptr->reply = dbus_message_new_method_return(call_ptr->message);
@@ -772 +849 @@
   {
     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))
-    {
-      template = NULL;
-      template_name = NULL;
-    }
-    else
-    {
-      template = find_room_template_by_uuid(template_uuid);
-      if (template != NULL)
-      {
-        template_name = ladish_room_get_name(template);
-      }
-      else
-      {
-        template_name = NULL;
-      }
-    }
 
     if (!dbus_message_iter_open_container(&array_iter, DBUS_TYPE_STRUCT, NULL, &struct_iter))
       goto fail_unref;
 
-    if (!dbus_message_iter_append_basic(&struct_iter, DBUS_TYPE_STRING, &opath))
-      goto fail_unref;
-
-    if (!dbus_message_iter_open_container(&struct_iter, DBUS_TYPE_ARRAY, "{sv}", &dict_iter))
-      goto fail_unref;
-
-    if (!dbus_maybe_add_dict_entry_string(&dict_iter, "template", template_name))
-      goto fail_unref;
-
-    if (!dbus_maybe_add_dict_entry_string(&dict_iter, "name", name))
-      goto fail_unref;
-
-    if (!dbus_message_iter_close_container(&struct_iter, &dict_iter))
+    if (!fill_room_info(&struct_iter, room))
       goto fail_unref;
 
@@ -919 +964 @@
 
 SIGNAL_ARGS_BEGIN(RoomAppeared, "Room D-Bus object appeared")
-  SIGNAL_ARG_DESCRIBE("room_path", "s", "room object path")
+  SIGNAL_ARG_DESCRIBE("opath", "s", "room object path")
+  SIGNAL_ARG_DESCRIBE("properties", "a{sv}", "room object path and props")
 SIGNAL_ARGS_END
 
+SIGNAL_ARGS_BEGIN(RoomChanged, "Room D-Bus object changed")
+  SIGNAL_ARG_DESCRIBE("opath", "s", "room object path")
+  SIGNAL_ARG_DESCRIBE("properties", "a{sv}", "room object path and props")
+SIGNAL_ARGS_END
+
 SIGNAL_ARGS_BEGIN(RoomDisappeared, "Room D-Bus object disappeared")
-  SIGNAL_ARG_DESCRIBE("room_path", "s", "room object path")
+  SIGNAL_ARG_DESCRIBE("opath", "s", "room object path")
+  SIGNAL_ARG_DESCRIBE("properties", "a{sv}", "room object path and props")
 SIGNAL_ARGS_END
 
@@ -933 +985 @@
   SIGNAL_DESCRIBE(RoomAppeared)
   SIGNAL_DESCRIBE(RoomDisappeared)
+  SIGNAL_DESCRIBE(RoomChanged)
 SIGNALS_END