summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorColin Guthrie <cguthrie@mandriva.org>2009-06-27 19:51:31 +0100
committerColin Guthrie <cguthrie@mandriva.org>2009-06-29 22:52:31 +0100
commita007d4740f2afe2eef04acb7c1b6d8371e3417b4 (patch)
treecadb2655b26995301196a0946aeb92b6c9ce773e
parent7ee1b471d96020305fa833819ab7a5a8f8a203ec (diff)
combine: Do not set (and update) description if the user passed one in during load.
Note that this will not turn off auto-description setting if the user were to update the proplist later, so such a change could be short lived.
-rw-r--r--src/modules/module-combine.c13
1 files changed, 12 insertions, 1 deletions
diff --git a/src/modules/module-combine.c b/src/modules/module-combine.c
index d50e59ae..16de6890 100644
--- a/src/modules/module-combine.c
+++ b/src/modules/module-combine.c
@@ -119,6 +119,7 @@ struct userdata {
uint32_t adjust_time;
pa_bool_t automatic;
+ pa_bool_t auto_desc;
pa_hook_slot *sink_put_slot, *sink_unlink_slot, *sink_state_changed_slot;
@@ -756,6 +757,9 @@ static void update_description(struct userdata *u) {
pa_assert(u);
+ if (!u->auto_desc)
+ return;
+
if (pa_idxset_isempty(u->outputs)) {
pa_sink_set_description(u->sink, "Simultaneous output");
return;
@@ -1073,7 +1077,6 @@ 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, "Simultaneous Output");
pa_proplist_sets(data.proplist, PA_PROP_DEVICE_CLASS, "filter");
if (slaves)
@@ -1085,6 +1088,14 @@ int pa__init(pa_module*m) {
goto fail;
}
+ /* Check proplist for a description & fill in a default value if not */
+ u->auto_desc = FALSE;
+ if (NULL == pa_proplist_gets(data.proplist, PA_PROP_DEVICE_DESCRIPTION)) {
+ u->auto_desc = TRUE;
+ pa_proplist_sets(data.proplist, PA_PROP_DEVICE_DESCRIPTION, "Simultaneous Output");
+ }
+
+
u->sink = pa_sink_new(m->core, &data, PA_SINK_LATENCY);
pa_sink_new_data_done(&data);