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: update to newest spec, generate 'Updated' signal

Browse source
This commit is contained in:
Lennart Poettering 2009-05-11 19:59:14 +02:00
parent 6c4c61de2c
commit 98a6454166
1 changed files with 9 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -79,16 +79,7 @@ PA_MODULE_USAGE(
" <method name=\"GetItems\">" \ " <method name=\"GetItems\">" \
" <arg name=\"children\" type=\"ao\" direction=\"out\"/>" \ " <arg name=\"children\" type=\"ao\" direction=\"out\"/>" \
" </method>" \ " </method>" \
" <signal name=\"ItemAdded\">" \ " <signal name=\"Updated\">" \
" <arg name=\"path\" type=\"o\"/>" \
" </signal>" \
" <signal name=\"ItemRemoved\">" \
" <arg name=\"path\" type=\"o\"/>" \
" </signal>" \
" <signal name=\"ContainerAdded\">" \
" <arg name=\"path\" type=\"o\"/>" \
" </signal>" \
" <signal name=\"ContainerRemoved\">" \
" <arg name=\"path\" type=\"o\"/>" \ " <arg name=\"path\" type=\"o\"/>" \
" </signal>" \ " </signal>" \
" </interface>" \ " </interface>" \
@ -164,9 +155,8 @@ struct userdata {
pa_http_protocol *http; pa_http_protocol *http;
}; };
static void send_signal(struct userdata *u, pa_source *s, const char *name) { static void send_signal(struct userdata *u, pa_source *s) {
DBusMessage *m; DBusMessage *m;
char *child;
const char *parent; const char *parent;
pa_assert(u); pa_assert(u);
@ -175,28 +165,22 @@ static void send_signal(struct userdata *u, pa_source *s, const char *name) {
if (u->core->state == PA_CORE_SHUTDOWN) if (u->core->state == PA_CORE_SHUTDOWN)
return; return;
if (s->monitor_of) { if (s->monitor_of)
parent = OBJECT_SINKS; parent = OBJECT_SINKS;
child = pa_sprintf_malloc(OBJECT_SINKS "/%s", s->monitor_of->name); else
} else {
parent = OBJECT_SOURCES; parent = OBJECT_SOURCES;
child = pa_sprintf_malloc(OBJECT_SOURCES "/%s", s->name);
}
pa_assert_se(m = dbus_message_new_signal(parent, "org.Rygel.MediaContainer1", name)); pa_assert_se(m = dbus_message_new_signal(parent, "org.Rygel.MediaContainer1", "Updated"));
pa_assert_se(dbus_message_append_args(m, DBUS_TYPE_OBJECT_PATH, &child, DBUS_TYPE_INVALID));
pa_assert_se(dbus_connection_send(pa_dbus_connection_get(u->bus), m, NULL)); pa_assert_se(dbus_connection_send(pa_dbus_connection_get(u->bus), m, NULL));
pa_xfree(child);
dbus_message_unref(m); dbus_message_unref(m);
} }
static pa_hook_result_t source_new_cb(pa_core *c, pa_source *s, struct userdata *u) { static pa_hook_result_t source_new_or_unlink_cb(pa_core *c, pa_source *s, struct userdata *u) {
pa_assert(c); pa_assert(c);
pa_source_assert_ref(s); pa_source_assert_ref(s);
send_signal(u, s, "ItemAdded"); send_signal(u, s);
return PA_HOOK_OK; return PA_HOOK_OK;
} }
@ -539,8 +523,8 @@ int pa__init(pa_module *m) {
pa_xfree(h); pa_xfree(h);
} }
u->source_new_slot = pa_hook_connect(&m->core->hooks[PA_CORE_HOOK_SOURCE_PUT], PA_HOOK_LATE, (pa_hook_cb_t) source_new_cb, u); u->source_new_slot = pa_hook_connect(&m->core->hooks[PA_CORE_HOOK_SOURCE_PUT], PA_HOOK_LATE, (pa_hook_cb_t) source_new_or_unlink_cb, u);
u->source_unlink_slot = pa_hook_connect(&m->core->hooks[PA_CORE_HOOK_SOURCE_UNLINK], PA_HOOK_LATE, (pa_hook_cb_t) source_unlink_cb, u); u->source_unlink_slot = pa_hook_connect(&m->core->hooks[PA_CORE_HOOK_SOURCE_UNLINK], PA_HOOK_LATE, (pa_hook_cb_t) source_new_or_unlink_cb, u);
if (!(u->bus = pa_dbus_bus_get(m->core, DBUS_BUS_SESSION, &error))) { if (!(u->bus = pa_dbus_bus_get(m->core, DBUS_BUS_SESSION, &error))) {
pa_log("Failed to get session bus connection: %s", error.message); pa_log("Failed to get session bus connection: %s", error.message);