summaryrefslogtreecommitdiffstats
path: root/src/modules
diff options
context:
space:
mode:
authorMaarten Bosmans <mkbosmans@gmail.com>2011-03-29 22:40:49 +0200
committerColin Guthrie <colin@mageia.org>2011-06-24 00:29:24 +0100
commitf0eab391df7c77b739eadc6c030ead1f4d68c72d (patch)
tree0210a894613d16f47fc5fe6f89b2c0786cb5e485 /src/modules
parentda884429628c239b146d1f79865126136734a1b0 (diff)
Remove obsolete description property from modules
Diffstat (limited to 'src/modules')
-rw-r--r--src/modules/module-null-sink.c3
-rw-r--r--src/modules/raop/module-raop-discover.c2
-rw-r--r--src/modules/raop/module-raop-sink.c8
3 files changed, 4 insertions, 9 deletions
diff --git a/src/modules/module-null-sink.c b/src/modules/module-null-sink.c
index 1db639ff..bedd6efc 100644
--- a/src/modules/module-null-sink.c
+++ b/src/modules/module-null-sink.c
@@ -80,7 +80,6 @@ static const char* const valid_modargs[] = {
"rate",
"channels",
"channel_map",
- "description", /* supported for compatibility reasons, made redundant by sink_properties= */
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_sample_spec(&data, &ss);
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");
if (pa_modargs_get_proplist(ma, "sink_properties", data.proplist, PA_UPDATE_REPLACE) < 0) {
diff --git a/src/modules/raop/module-raop-discover.c b/src/modules/raop/module-raop-discover.c
index da1e82b3..de1a2b1c 100644
--- a/src/modules/raop/module-raop-discover.c
+++ b/src/modules/raop/module-raop-discover.c
@@ -195,7 +195,7 @@ static void resolver_cb(
if (nicename) {
args = pa_sprintf_malloc("server=%s "
"sink_name=%s "
- "description=\"%s\"",
+ "sink_properties=device.description=\"%s\"",
avahi_address_snprint(at, sizeof(at), a),
vname,
nicename);
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");