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

Remove obsolete description property from modules

Browse source
This commit is contained in:
Maarten Bosmans 2011-03-29 22:40:49 +02:00 • committed by Colin Guthrie
parent da88442962
commit f0eab391df
3 changed files with 4 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/modules/module-null-sink.c
View file

@ -80,7 +80,6 @@ static const char* const valid_modargs[] = {
"rate", "rate",
"channels", "channels",
"channel_map", "channel_map",
"description", /* supported for compatibility reasons, made redundant by sink_properties= */
NULL NULL
}; };
@ -282,7 +281,7 @@ 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_name(&data, pa_modargs_get_value(ma, "sink_name", DEFAULT_SINK_NAME));
pa_sink_new_data_set_sample_spec(&data, &ss); pa_sink_new_data_set_sample_spec(&data, &ss);
pa_sink_new_data_set_channel_map(&data, &map); pa_sink_new_data_set_channel_map(&data, &map);
pa_proplist_sets(data.proplist, PA_PROP_DEVICE_DESCRIPTION, pa_modargs_get_value(ma, "description", _("Null Output"))); pa_proplist_sets(data.proplist, PA_PROP_DEVICE_DESCRIPTION, _("Null Output"));
pa_proplist_sets(data.proplist, PA_PROP_DEVICE_CLASS, "abstract"); pa_proplist_sets(data.proplist, PA_PROP_DEVICE_CLASS, "abstract");
if (pa_modargs_get_proplist(ma, "sink_properties", data.proplist, PA_UPDATE_REPLACE) < 0) { if (pa_modargs_get_proplist(ma, "sink_properties", data.proplist, PA_UPDATE_REPLACE) < 0) {

2
src/modules/raop/module-raop-discover.c
View file

@ -195,7 +195,7 @@ static void resolver_cb(
if (nicename) { if (nicename) {
args = pa_sprintf_malloc("server=%s " args = pa_sprintf_malloc("server=%s "
"sink_name=%s " "sink_name=%s "
"description=\"%s\"", "sink_properties=device.description=\"%s\"",
avahi_address_snprint(at, sizeof(at), a), avahi_address_snprint(at, sizeof(at), a),
vname, vname,
nicename); nicename);

8
src/modules/raop/module-raop-sink.c
View file

@ -118,7 +118,6 @@ static const char* const valid_modargs[] = {
"format", "format",
"rate", "rate",
"channels", "channels",
"description", /* supported for compatibility reasons, made redundant by sink_properties= */
NULL NULL
}; };
@ -507,7 +506,7 @@ int pa__init(pa_module*m) {
struct userdata *u = NULL; struct userdata *u = NULL;
pa_sample_spec ss; pa_sample_spec ss;
pa_modargs *ma = NULL; pa_modargs *ma = NULL;
const char *server, *desc; const char *server;
pa_sink_new_data data; pa_sink_new_data data;
pa_assert(m); pa_assert(m);
@ -577,10 +576,7 @@ int pa__init(pa_module*m) {
pa_sink_new_data_set_sample_spec(&data, &ss); pa_sink_new_data_set_sample_spec(&data, &ss);
pa_proplist_sets(data.proplist, PA_PROP_DEVICE_STRING, server); pa_proplist_sets(data.proplist, PA_PROP_DEVICE_STRING, server);
pa_proplist_sets(data.proplist, PA_PROP_DEVICE_INTENDED_ROLES, "music"); pa_proplist_sets(data.proplist, PA_PROP_DEVICE_INTENDED_ROLES, "music");
if ((desc = pa_modargs_get_value(ma, "description", NULL))) pa_proplist_setf(data.proplist, PA_PROP_DEVICE_DESCRIPTION, "RAOP sink '%s'", server);
pa_proplist_sets(data.proplist, PA_PROP_DEVICE_DESCRIPTION, desc);
else
pa_proplist_setf(data.proplist, PA_PROP_DEVICE_DESCRIPTION, "RAOP sink '%s'", server);
if (pa_modargs_get_proplist(ma, "sink_properties", data.proplist, PA_UPDATE_REPLACE) < 0) { if (pa_modargs_get_proplist(ma, "sink_properties", data.proplist, PA_UPDATE_REPLACE) < 0) {
pa_log("Invalid properties"); pa_log("Invalid properties");