diff options
author | Maarten Bosmans <mkbosmans@gmail.com> | 2011-03-29 22:40:49 +0200 |
---|---|---|
committer | Colin Guthrie <colin@mageia.org> | 2011-06-24 00:29:24 +0100 |
commit | f0eab391df7c77b739eadc6c030ead1f4d68c72d (patch) | |
tree | 0210a894613d16f47fc5fe6f89b2c0786cb5e485 /src/modules/raop/module-raop-sink.c | |
parent | da884429628c239b146d1f79865126136734a1b0 (diff) |
Remove obsolete description property from modules
Diffstat (limited to 'src/modules/raop/module-raop-sink.c')
-rw-r--r-- | src/modules/raop/module-raop-sink.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/modules/raop/module-raop-sink.c b/src/modules/raop/module-raop-sink.c index 3f362b20..87e7bc17 100644 --- a/src/modules/raop/module-raop-sink.c +++ b/src/modules/raop/module-raop-sink.c @@ -118,7 +118,6 @@ static const char* const valid_modargs[] = { "format", "rate", "channels", - "description", /* supported for compatibility reasons, made redundant by sink_properties= */ NULL }; @@ -507,7 +506,7 @@ int pa__init(pa_module*m) { struct userdata *u = NULL; pa_sample_spec ss; pa_modargs *ma = NULL; - const char *server, *desc; + const char *server; pa_sink_new_data data; pa_assert(m); @@ -577,10 +576,7 @@ int pa__init(pa_module*m) { 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_INTENDED_ROLES, "music"); - 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); + 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) { pa_log("Invalid properties"); |