summaryrefslogtreecommitdiffstats
path: root/src/modules/module-combine.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2009-02-21 16:32:42 +0100
committerLennart Poettering <lennart@poettering.net>2009-02-21 16:32:42 +0100
commit4505bc9cc6bb1f9206f922a992a9be0e17703df1 (patch)
tree7a98f5c2990b19683dccbfb9128ba1cd5c9bacd9 /src/modules/module-combine.c
parent27bfa607b90b25aa4fdefc0882091093164297a5 (diff)
introduce default channel map in addition to the default sample spec
Diffstat (limited to 'src/modules/module-combine.c')
-rw-r--r--src/modules/module-combine.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/modules/module-combine.c b/src/modules/module-combine.c
index 7f1ef24c..6ed4f141 100644
--- a/src/modules/module-combine.c
+++ b/src/modules/module-combine.c
@@ -1052,8 +1052,9 @@ int pa__init(pa_module*m) {
slaves = pa_modargs_get_value(ma, "slaves", NULL);
u->automatic = !slaves;
- ss = m->core->default_sample_spec;
+ ss = m->core->default_sample_spec;
+ map = m->core->default_channel_map;
if ((pa_modargs_get_sample_spec_and_channel_map(ma, &ss, &map, PA_CHANNEL_MAP_DEFAULT) < 0)) {
pa_log("Invalid sample specification.");
goto fail;