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

rygel: make server name configurable

Browse source
This commit is contained in:
Lennart Poettering 2009-04-29 23:48:40 +02:00
parent c95cc9e55f
commit d5f9057558
1 changed files with 21 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -35,6 +35,7 @@
#include <pulse/xmalloc.h> #include <pulse/xmalloc.h>
#include <pulse/util.h> #include <pulse/util.h>
#include <pulse/i18n.h> #include <pulse/i18n.h>
#include <pulse/utf8.h>
#include <pulsecore/sink.h> #include <pulsecore/sink.h>
#include <pulsecore/source.h> #include <pulsecore/source.h>
@ -53,6 +54,8 @@ PA_MODULE_AUTHOR("Lennart Poettering");
PA_MODULE_DESCRIPTION("UPnP MediaServer Plugin for Rygel"); PA_MODULE_DESCRIPTION("UPnP MediaServer Plugin for Rygel");
PA_MODULE_VERSION(PACKAGE_VERSION); PA_MODULE_VERSION(PACKAGE_VERSION);
PA_MODULE_LOAD_ONCE(TRUE); PA_MODULE_LOAD_ONCE(TRUE);
PA_MODULE_USAGE(
"display_name=<UPnP Media Server name>");
/* This implements http://live.gnome.org/action/edit/Rygel/MediaProviderSpec */ /* This implements http://live.gnome.org/action/edit/Rygel/MediaProviderSpec */
@ -141,6 +144,7 @@ PA_MODULE_LOAD_ONCE(TRUE);
static const char* const valid_modargs[] = { static const char* const valid_modargs[] = {
"display_name",
NULL NULL
}; };
@ -151,6 +155,8 @@ struct userdata {
pa_dbus_connection *bus; pa_dbus_connection *bus;
pa_bool_t got_name:1; pa_bool_t got_name:1;
char *display_name;
pa_hook_slot *source_new_slot, *source_unlink_slot; pa_hook_slot *source_new_slot, *source_unlink_slot;
}; };
@ -260,7 +266,7 @@ static DBusHandlerResult root_handler(DBusConnection *c, DBusMessage *m, void *u
} else if (message_is_property_get(m, "org.Rygel.MediaObject1", "display-name")) { } else if (message_is_property_get(m, "org.Rygel.MediaObject1", "display-name")) {
pa_assert_se(r = dbus_message_new_method_return(m)); pa_assert_se(r = dbus_message_new_method_return(m));
append_variant_string(r, "PulseAudio"); append_variant_string(r, u->display_name);
} 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")) {
const char *xml = ROOT_INTROSPECT_XML; const char *xml = ROOT_INTROSPECT_XML;
@ -462,6 +468,8 @@ int pa__init(pa_module *m) {
struct userdata *u; struct userdata *u;
pa_modargs *ma = NULL; pa_modargs *ma = NULL;
DBusError error; DBusError error;
const char *t;
static const DBusObjectPathVTable vtable_root = { static const DBusObjectPathVTable vtable_root = {
.message_function = root_handler, .message_function = root_handler,
}; };
@ -480,6 +488,16 @@ int pa__init(pa_module *m) {
u->core = m->core; u->core = m->core;
u->module = m; u->module = m;
if ((t = pa_modargs_get_value(ma, "display_name", NULL)))
u->display_name = pa_utf8_filter(t);
else {
char *h;
h = pa_get_host_name_malloc();
u->display_name = pa_sprintf_malloc(_("Audio on %s"), 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_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_unlink_cb, u);
@ -545,5 +563,7 @@ void pa__done(pa_module*m) {
pa_dbus_connection_unref(u->bus); pa_dbus_connection_unref(u->bus);
} }
pa_xfree(u->display_name);
pa_xfree(u); pa_xfree(u);
} }