mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-03 09:01:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

upnp: implement item-count/container-count properties

Browse source
This commit is contained in:
Lennart Poettering 2009-05-14 01:43:12 +02:00
parent 0cb383717e
commit 234c61b638
1 changed files with 82 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

92
src/modules/module-rygel-media-server.c
View file

@ -82,6 +82,8 @@ PA_MODULE_USAGE(
" <signal name=\"Updated\">" \ " <signal name=\"Updated\">" \
" <arg name=\"path\" type=\"o\"/>" \ " <arg name=\"path\" type=\"o\"/>" \
" </signal>" \ " </signal>" \
" <property name=\"item-count\" type=\"u\" access=\"read\"/>" \
" <property name=\"container-count\" type=\"u\" access=\"read\"/>" \
" </interface>" \ " </interface>" \
" <interface name=\"org.Rygel.MediaObject1\">" \ " <interface name=\"org.Rygel.MediaObject1\">" \
" <property name=\"icon-name\" type=\"s\" access=\"read\"/>" \ " <property name=\"icon-name\" type=\"s\" access=\"read\"/>" \
@ -248,7 +250,22 @@ static void append_variant_string(DBusMessage *m, DBusMessageIter *iter, const c
pa_assert_se(dbus_message_iter_close_container(iter, &sub)); pa_assert_se(dbus_message_iter_close_container(iter, &sub));
} }
static void append_property_dict_entry(DBusMessage *m, DBusMessageIter *iter, const char *name, const char *value) { static void append_variant_unsigned(DBusMessage *m, DBusMessageIter *iter, unsigned u) {
DBusMessageIter _iter, sub;
pa_assert(m);
if (!iter) {
dbus_message_iter_init_append(m, &_iter);
iter = &_iter;
}
pa_assert_se(dbus_message_iter_open_container(iter, DBUS_TYPE_VARIANT, "u", &sub));
pa_assert_se(dbus_message_iter_append_basic(&sub, DBUS_TYPE_UINT32, &u));
pa_assert_se(dbus_message_iter_close_container(iter, &sub));
}
static void append_property_dict_entry_string(DBusMessage *m, DBusMessageIter *iter, const char *name, const char *value) {
DBusMessageIter sub; DBusMessageIter sub;
pa_assert(iter); pa_assert(iter);
@ -259,6 +276,17 @@ static void append_property_dict_entry(DBusMessage *m, DBusMessageIter *iter, co
pa_assert_se(dbus_message_iter_close_container(iter, &sub)); pa_assert_se(dbus_message_iter_close_container(iter, &sub));
} }
static void append_property_dict_entry_unsigned(DBusMessage *m, DBusMessageIter *iter, const char *name, unsigned u) {
DBusMessageIter sub;
pa_assert(iter);
pa_assert_se(dbus_message_iter_open_container(iter, DBUS_TYPE_DICT_ENTRY, NULL, &sub));
pa_assert_se(dbus_message_iter_append_basic(&sub, DBUS_TYPE_STRING, &name));
append_variant_unsigned(m, &sub, u);
pa_assert_se(dbus_message_iter_close_container(iter, &sub));
}
static DBusHandlerResult root_handler(DBusConnection *c, DBusMessage *m, void *userdata) { static DBusHandlerResult root_handler(DBusConnection *c, DBusMessage *m, void *userdata) {
struct userdata *u = userdata; struct userdata *u = userdata;
DBusMessage *r = NULL; DBusMessage *r = NULL;
@ -300,8 +328,27 @@ static DBusHandlerResult root_handler(DBusConnection *c, DBusMessage *m, void *u
dbus_message_iter_init_append(r, &iter); dbus_message_iter_init_append(r, &iter);
pa_assert_se(dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY, "{sv}", &sub)); pa_assert_se(dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY, "{sv}", &sub));
append_property_dict_entry(r, &sub, "display-name", u->display_name); append_property_dict_entry_string(r, &sub, "display-name", u->display_name);
append_property_dict_entry(r, &sub, "icon-name", "audio-card"); append_property_dict_entry_string(r, &sub, "icon-name", "audio-card");
pa_assert_se(dbus_message_iter_close_container(&iter, &sub));
} else if (message_is_property_get(m, "org.Rygel.MediaContainer1", "item-count")) {
pa_assert_se(r = dbus_message_new_method_return(m));
append_variant_unsigned(r, NULL, 0);
} else if (message_is_property_get(m, "org.Rygel.MediaContainer1", "container-count")) {
pa_assert_se(r = dbus_message_new_method_return(m));
append_variant_unsigned(r, NULL, 2);
} else if (message_is_property_get_all(m, "org.Rygel.MediaContainer1")) {
DBusMessageIter iter, sub;
pa_assert_se(r = dbus_message_new_method_return(m));
dbus_message_iter_init_append(r, &iter);
pa_assert_se(dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY, "{sv}", &sub));
append_property_dict_entry_unsigned(r, &sub, "item-count", 0);
append_property_dict_entry_unsigned(r, &sub, "container-count", 2);
pa_assert_se(dbus_message_iter_close_container(&iter, &sub)); pa_assert_se(dbus_message_iter_close_container(&iter, &sub));
} else if (dbus_message_is_method_call(m, "org.freedesktop.DBus.Introspectable", "Introspect")) { } else if (dbus_message_is_method_call(m, "org.freedesktop.DBus.Introspectable", "Introspect")) {
@ -441,12 +488,37 @@ static DBusHandlerResult sinks_and_sources_handler(DBusConnection *c, DBusMessag
dbus_message_iter_init_append(r, &iter); dbus_message_iter_init_append(r, &iter);
pa_assert_se(dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY, "{sv}", &sub)); pa_assert_se(dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY, "{sv}", &sub));
append_property_dict_entry(m, &sub, "display-name", append_property_dict_entry_string(m, &sub, "display-name",
pa_streq(path, OBJECT_SINKS) ? pa_streq(path, OBJECT_SINKS) ?
_("Output Devices") : _("Output Devices") :
_("Input Devices")); _("Input Devices"));
pa_assert_se(dbus_message_iter_close_container(&iter, &sub)); pa_assert_se(dbus_message_iter_close_container(&iter, &sub));
} else if (message_is_property_get(m, "org.Rygel.MediaContainer1", "item-count")) {
pa_assert_se(r = dbus_message_new_method_return(m));
append_variant_unsigned(r, NULL,
pa_streq(path, OBJECT_SINKS) ?
pa_idxset_size(u->core->sinks) :
pa_idxset_size(u->core->sources));
} else if (message_is_property_get(m, "org.Rygel.MediaContainer1", "container-count")) {
pa_assert_se(r = dbus_message_new_method_return(m));
append_variant_unsigned(r, NULL, 0);
} else if (message_is_property_get_all(m, "org.Rygel.MediaContainer1")) {
DBusMessageIter iter, sub;
pa_assert_se(r = dbus_message_new_method_return(m));
dbus_message_iter_init_append(r, &iter);
pa_assert_se(dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY, "{sv}", &sub));
append_property_dict_entry_unsigned(r, &sub, "item-count",
pa_streq(path, OBJECT_SINKS) ?
pa_idxset_size(u->core->sinks) :
pa_idxset_size(u->core->sources));
append_property_dict_entry_unsigned(r, &sub, "container-count", 0);
pa_assert_se(dbus_message_iter_close_container(&iter, &sub));
} else if (dbus_message_is_method_call(m, "org.freedesktop.DBus.Introspectable", "Introspect")) { } else if (dbus_message_is_method_call(m, "org.freedesktop.DBus.Introspectable", "Introspect")) {
pa_strbuf *sb; pa_strbuf *sb;
char *xml; char *xml;
@ -540,7 +612,7 @@ static DBusHandlerResult sinks_and_sources_handler(DBusConnection *c, DBusMessag
dbus_message_iter_init_append(r, &iter); dbus_message_iter_init_append(r, &iter);
pa_assert_se(dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY, "{sv}", &sub)); pa_assert_se(dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY, "{sv}", &sub));
append_property_dict_entry(r, &sub, "display-name", pa_strna(pa_proplist_gets(sink ? sink->proplist : source->proplist, PA_PROP_DEVICE_DESCRIPTION))); append_property_dict_entry_string(r, &sub, "display-name", pa_strna(pa_proplist_gets(sink ? sink->proplist : source->proplist, PA_PROP_DEVICE_DESCRIPTION)));
pa_assert_se(dbus_message_iter_close_container(&iter, &sub)); pa_assert_se(dbus_message_iter_close_container(&iter, &sub));
} else if (message_is_property_get_all(m, "org.Rygel.MediaItem1")) { } else if (message_is_property_get_all(m, "org.Rygel.MediaItem1")) {
@ -552,14 +624,14 @@ static DBusHandlerResult sinks_and_sources_handler(DBusConnection *c, DBusMessag
dbus_message_iter_init_append(r, &iter); dbus_message_iter_init_append(r, &iter);
pa_assert_se(dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY, "{sv}", &sub)); pa_assert_se(dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY, "{sv}", &sub));
append_property_dict_entry(r, &sub, "type", "audio"); append_property_dict_entry_string(r, &sub, "type", "audio");
if (sink) if (sink)
t = pa_sample_spec_to_mime_type_mimefy(&sink->sample_spec, &sink->channel_map); t = pa_sample_spec_to_mime_type_mimefy(&sink->sample_spec, &sink->channel_map);
else else
t = pa_sample_spec_to_mime_type_mimefy(&source->sample_spec, &source->channel_map); t = pa_sample_spec_to_mime_type_mimefy(&source->sample_spec, &source->channel_map);
append_property_dict_entry(r, &sub, "mime-type", t); append_property_dict_entry_string(r, &sub, "mime-type", t);
pa_xfree(t); pa_xfree(t);
pa_assert_se(dbus_message_iter_open_container(&sub, DBUS_TYPE_DICT_ENTRY, NULL, &dict)); pa_assert_se(dbus_message_iter_open_container(&sub, DBUS_TYPE_DICT_ENTRY, NULL, &dict));