LADI
/
ladish
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix names of some studio room and room template methods

This commit is contained in:
Nedko Arnaudov 2010-03-21 23:18:04 +02:00
parent 83b6150422
commit 30a6aa77d4
5 changed files with 55 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
daemon/control.c
View File

@ -411,7 +411,7 @@ fail:
#define array_iter_ptr ((DBusMessageIter *)context)
bool room_list_filler(void * context, ladish_room_handle room)
bool room_template_list_filler(void * context, ladish_room_handle room)
{
DBusMessageIter struct_iter;
DBusMessageIter dict_iter;
@ -439,7 +439,7 @@ bool room_list_filler(void * context, ladish_room_handle room)
#undef array_iter_ptr
static void ladish_get_room_list(struct dbus_method_call * call_ptr)
static void ladish_get_room_template_list(struct dbus_method_call * call_ptr)
{
DBusMessageIter iter, array_iter;
@ -456,7 +456,7 @@ static void ladish_get_room_list(struct dbus_method_call * call_ptr)
goto fail_unref;
}
if (!rooms_enum(&array_iter, room_list_filler))
if (!rooms_enum(&array_iter, room_template_list_filler))
{
goto fail_unref;
}
@ -476,7 +476,7 @@ fail:
log_error("Ran out of memory trying to construct method return");
}
static void ladish_delete_room(struct dbus_method_call * call_ptr)
static void ladish_delete_room_template(struct dbus_method_call * call_ptr)
{
const char * name;
@ -496,7 +496,7 @@ static void ladish_delete_room(struct dbus_method_call * call_ptr)
}
}
static void ladish_new_room(struct dbus_method_call * call_ptr)
static void ladish_create_room_template(struct dbus_method_call * call_ptr)
{
const char * name;
@ -570,16 +570,16 @@ METHOD_ARGS_BEGIN(GetApplicationList, "Get list of applications that can be laun
METHOD_ARG_DESCRIBE_OUT("applications", "a(sa{sv})", "List of applications, name and properties")
METHOD_ARGS_END
METHOD_ARGS_BEGIN(GetRoomList, "Get list of rooms")
METHOD_ARG_DESCRIBE_OUT("room_list", "a(sa{sv})", "List of rooms, name and properties")
METHOD_ARGS_BEGIN(GetRoomTemplateList, "Get list of room templates")
METHOD_ARG_DESCRIBE_OUT("room_template_list", "a(sa{sv})", "List of room templates (name and properties)")
METHOD_ARGS_END
METHOD_ARGS_BEGIN(NewRoom, "New room")
METHOD_ARG_DESCRIBE_IN("room_name", "s", "Name of the room")
METHOD_ARGS_BEGIN(CreateRoomTemplate, "New room template")
METHOD_ARG_DESCRIBE_IN("room_template name", "s", "Name of the room template")
METHOD_ARGS_END
METHOD_ARGS_BEGIN(DeleteRoom, "Delete room")
METHOD_ARG_DESCRIBE_IN("room_name", "s", "Name of room to delete")
METHOD_ARGS_BEGIN(DeleteRoomTemplate, "Delete room template")
METHOD_ARG_DESCRIBE_IN("room_template_name", "s", "Name of room template to delete")
METHOD_ARGS_END
METHOD_ARGS_BEGIN(Exit, "Tell ladish D-Bus service to exit")
@ -592,9 +592,9 @@ METHODS_BEGIN
METHOD_DESCRIBE(LoadStudio, ladish_load_studio)
METHOD_DESCRIBE(DeleteStudio, ladish_delete_studio)
METHOD_DESCRIBE(GetApplicationList, ladish_get_application_list)
METHOD_DESCRIBE(GetRoomList, ladish_get_room_list)
METHOD_DESCRIBE(NewRoom, ladish_new_room)
METHOD_DESCRIBE(DeleteRoom, ladish_delete_room)
METHOD_DESCRIBE(GetRoomTemplateList, ladish_get_room_template_list)
METHOD_DESCRIBE(CreateRoomTemplate, ladish_create_room_template)
METHOD_DESCRIBE(DeleteRoomTemplate, ladish_delete_room_template)
METHOD_DESCRIBE(Exit, ladish_exit)
METHODS_END

6
daemon/studio.c
View File

@ -804,7 +804,7 @@ static void ladish_studio_is_started(struct dbus_method_call * call_ptr)
method_return_new_single(call_ptr, DBUS_TYPE_BOOLEAN, &started);
}
static void ladish_studio_new_room(struct dbus_method_call * call_ptr)
static void ladish_studio_create_room(struct dbus_method_call * call_ptr)
{
const char * room_name;
const char * template_name;
@ -978,7 +978,7 @@ METHOD_ARGS_BEGIN(IsStarted, "Check whether studio is started")
METHOD_ARG_DESCRIBE_OUT("started", "b", "Whether studio is started")
METHOD_ARGS_END
METHOD_ARGS_BEGIN(NewRoom, "New studio room")
METHOD_ARGS_BEGIN(CreateRoom, "Create new studio room")
METHOD_ARG_DESCRIBE_IN("room_name", "s", "Studio room name")
METHOD_ARG_DESCRIBE_IN("room_template_name", "s", "Room template name")
METHOD_ARGS_END
@ -1000,7 +1000,7 @@ METHODS_BEGIN
METHOD_DESCRIBE(Start, ladish_start_studio)
METHOD_DESCRIBE(Stop, ladish_stop_studio)
METHOD_DESCRIBE(IsStarted, ladish_studio_is_started)
METHOD_DESCRIBE(NewRoom, ladish_studio_new_room)
METHOD_DESCRIBE(CreateRoom, ladish_studio_create_room)
METHOD_DESCRIBE(GetRoomList, ladish_studio_get_room_list)
METHOD_DESCRIBE(DeleteRoom, ladish_studio_delete_room)
METHODS_END

68
ladish_control
View File

@ -97,25 +97,25 @@ def main():
if len(sys.argv) == 1:
print("Usage: %s [command] [command] ..." % os.path.basename(sys.argv[0]))
print("Commands:")
print(" exit - exit ladish dbus service")
print(" slist - list studios")
print(" alist - list apps")
print(" sload <studioname> - load studio")
print(" sdel <studioname> - delete studio")
print(" snew [studioname] - new studio")
print(" sisloaded - is studio loaded?")
print(" sname - get studio name")
print(" ssave - save studio")
print(" sunload - unload studio")
print(" srename <studioname> - rename studio")
print(" sstart - start studio")
print(" sstop - stop studio")
print(" rlist - list rooms")
print(" rdel <roomname> - delete room")
print(" rnew <roomname> - new room")
print(" snewroom <name> <tname> - new studio room")
print(" srlist - list studio rooms")
print(" sdelroom <name> - delete studio room")
print(" exit - exit ladish dbus service")
print(" slist - list studios")
print(" alist - list apps")
print(" sload <studioname> - load studio")
print(" sdel <studioname> - delete studio")
print(" snew [studioname] - new studio")
print(" sisloaded - is studio loaded?")
print(" sname - get studio name")
print(" ssave - save studio")
print(" sunload - unload studio")
print(" srename <studioname> - rename studio")
print(" sstart - start studio")
print(" sstop - stop studio")
print(" rtlist - list room templates")
print(" rtdel <roomtemplatename> - delete room template")
print(" rtnew <roomtemplatename> - create new room template")
print(" snewroom <rname> <rtname> - create new studio room")
print(" srlist - list studio rooms")
print(" sdelroom <rname> - delete studio room")
sys.exit(0)
bus = dbus.SessionBus()
@ -187,31 +187,31 @@ def main():
print("yes")
else:
print("no")
elif arg == 'rlist':
print("--- room list")
for studio in control_iface.GetRoomList():
elif arg == 'rtlist':
print("--- list room templates")
for studio in control_iface.GetRoomTemplateList():
name = studio[0]
print('"%s"' % name)
elif arg == 'rnew':
print("--- room new")
elif arg == 'rtnew':
print("--- create new room template")
if index >= len(sys.argv):
print("new room command requires room name argument")
print("create new room template command requires room template name argument")
sys.exit()
arg = sys.argv[index]
index += 1
control_iface.NewRoom(arg)
elif arg == 'rdel':
print("--- room delete")
control_iface.CreateRoomTemplate(arg)
elif arg == 'rtdel':
print("--- delete room template")
if index >= len(sys.argv):
print("delete room command requires room name argument")
print("delete room template command requires room template name argument")
sys.exit()
arg = sys.argv[index]
index += 1
control_iface.DeleteRoom(arg)
control_iface.DeleteRoomTemplate(arg)
else:
if not studio_obj:
studio_obj = bus.get_object(service_name, studio_object_path)
@ -245,7 +245,7 @@ def main():
print("--- studio stop")
studio_iface.Stop()
elif arg == 'snewroom':
print("--- new studio room")
print("--- create new studio room")
if index + 1 >= len(sys.argv):
print("creation of studio room requires room name and room template name arguments")
sys.exit()
@ -255,9 +255,9 @@ def main():
room_template_name = sys.argv[index]
index += 1
studio_iface.NewRoom(room_name, room_template_name)
studio_iface.CreateRoom(room_name, room_template_name)
elif arg == 'srlist':
print("--- studio room list")
print("--- list studio rooms")
for room in studio_iface.GetRoomList():
#print repr(room)
opath = room[0]
@ -272,7 +272,7 @@ def main():
else:
print('"%s" (%s)' % (name, opath))
elif arg == 'sdelroom':
print("--- studio room delete")
print("--- delete studio room")
if index >= len(sys.argv):
print("delete studio room command requires room name argument")
sys.exit()

6
proxies/control_proxy.c
View File

@ -234,16 +234,16 @@ bool control_proxy_get_room_template_list(void (* callback)(void * context, cons
DBusMessageIter array_iter;
const char * name;
if (!dbus_call(SERVICE_NAME, CONTROL_OBJECT_PATH, IFACE_CONTROL, "GetRoomList", "", NULL, &reply_ptr))
if (!dbus_call(SERVICE_NAME, CONTROL_OBJECT_PATH, IFACE_CONTROL, "GetRoomTemplateList", "", NULL, &reply_ptr))
{
log_error("GetRoomList() failed.");
log_error("GetRoomTemplateList() failed.");
return false;
}
reply_signature = dbus_message_get_signature(reply_ptr);
if (strcmp(reply_signature, "a(sa{sv})") != 0)
{
log_error("GetRoomList() reply signature mismatch. '%s'", reply_signature);
log_error("GetRoomTemplateList() reply signature mismatch. '%s'", reply_signature);
dbus_message_unref(reply_ptr);
return false;
}

2
proxies/studio_proxy.c
View File

@ -332,7 +332,7 @@ unref:
bool studio_proxy_create_room(const char * name, const char * template)
{
return dbus_call(SERVICE_NAME, STUDIO_OBJECT_PATH, IFACE_STUDIO, "NewRoom", "ss", &name, &template, "");
return dbus_call(SERVICE_NAME, STUDIO_OBJECT_PATH, IFACE_STUDIO, "CreateRoom", "ss", &name, &template, "");
}
bool studio_proxy_delete_room(const char * name)