diff options
| author | Colin Guthrie <cguthrie@mandriva.org> | 2009-03-01 18:10:35 +0000 |
|---|---|---|
| committer | Colin Guthrie <cguthrie@mandriva.org> | 2009-03-01 23:19:31 +0000 |
| commit | d293f08442ee750373257dd3f769f14bfbef3432 (patch) | |
| tree | c8fcd9fc453d6908f03c96203344babd97e5a692 /src/modules/module-raop-sink.c | |
| parent | 8fc9b19cb314329487a62a15c523e9778298f1d5 (diff) | |
raop: Allow for nice sink descriptions to be set (interpolated from avahi)
Diffstat (limited to 'src/modules/module-raop-sink.c')
| -rw-r--r-- | src/modules/module-raop-sink.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/modules/module-raop-sink.c b/src/modules/module-raop-sink.c index da338f5d..88fc6f1e 100644 --- a/src/modules/module-raop-sink.c +++ b/src/modules/module-raop-sink.c @@ -72,6 +72,7 @@ PA_MODULE_VERSION(PACKAGE_VERSION); PA_MODULE_LOAD_ONCE(FALSE); PA_MODULE_USAGE( "sink_name=<name for the sink> " + "description=<description for the sink> " "server=<address> " "format=<sample format> " "channels=<number of channels> " @@ -122,6 +123,7 @@ static const char* const valid_modargs[] = { "format", "channels", "sink_name", + "description", NULL }; @@ -502,7 +504,7 @@ int pa__init(pa_module*m) { struct userdata *u = NULL; pa_sample_spec ss; pa_modargs *ma = NULL; - const char *server; + const char *server, *desc; pa_sink_new_data data; pa_assert(m); @@ -564,7 +566,10 @@ int pa__init(pa_module*m) { pa_sink_new_data_set_name(&data, pa_modargs_get_value(ma, "sink_name", DEFAULT_SINK_NAME)); pa_sink_new_data_set_sample_spec(&data, &ss); pa_proplist_sets(data.proplist, PA_PROP_DEVICE_STRING, server); - pa_proplist_setf(data.proplist, PA_PROP_DEVICE_DESCRIPTION, "RAOP sink '%s'", server); + if ((desc = pa_modargs_get_value(ma, "description", NULL))) + pa_proplist_sets(data.proplist, PA_PROP_DEVICE_DESCRIPTION, desc); + else + pa_proplist_setf(data.proplist, PA_PROP_DEVICE_DESCRIPTION, "RAOP sink '%s'", server); u->sink = pa_sink_new(m->core, &data, PA_SINK_LATENCY|PA_SINK_NETWORK); pa_sink_new_data_done(&data); |