Changeset a459a2a19cd0f110f245f6c1cbf0a39f6f2a6dad

Timestamp:

03/06/10 17:18:48 (5 months ago)

Author:

Nedko Arnaudov <nedko@…>

Children:

c2f277228ed93d3377c520fa75ba53e51c484254

Parents:

2fd730ea55ee6a1df6b457076c67e4a8edae0580

git-committer:

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

Message:

Use opath as primary identification of rooms in studio rooms list

Files:

• daemon/studio.c (modified) (3 diffs)
• ladish_control (modified) (2 diffs)

daemon/studio.c

@@ -796 +796 @@
       goto fail_unref;
 
-    if (!dbus_message_iter_append_basic(&struct_iter, DBUS_TYPE_STRING, &name))
+    if (!dbus_message_iter_append_basic(&struct_iter, DBUS_TYPE_STRING, &opath))
       goto fail_unref;
 
@@ -805 +805 @@
       goto fail_unref;
 
-    if (!dbus_maybe_add_dict_entry_string(&dict_iter, "opath", opath))
+    if (!dbus_maybe_add_dict_entry_string(&dict_iter, "name", name))
       goto fail_unref;
 
@@ -884 +884 @@
 
 METHOD_ARGS_BEGIN(GetRoomList, "Get list of rooms in this studio")
-  METHOD_ARG_DESCRIBE_OUT("room_list", "a(sa{sv})", "List of studio rooms, name and properties")
+  METHOD_ARG_DESCRIBE_OUT("room_list", "a(sa{sv})", "List of studio rooms: opaths and properties")
 METHOD_ARGS_END
 

ladish_control

@@ -261 +261 @@
                     for room in studio_iface.GetRoomList():
                         #print repr(room)
-                        name = room[0]
+                        opath = room[0]
+                        name = room[1]["name"]
                         if room[1].has_key("template"):
                             template = str(room[1]["template"])
@@ -268 +269 @@
 
                         if template:
-                            print('"%s" from template "%s"' % (name, template))
+                            print('"%s" from template "%s" (%s)' % (name, template, opath))
                         else:
-                            print('"%s"' % name)
+                            print('"%s" (%s)' % (name, opath))
                 elif arg == 'sdelroom':
                     print("--- studio room delete")