summaryrefslogtreecommitdiffstats
path: root/src/modules/module-alsa-sink.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/modules/module-alsa-sink.c')
-rw-r--r--src/modules/module-alsa-sink.c15
1 files changed, 2 insertions, 13 deletions
diff --git a/src/modules/module-alsa-sink.c b/src/modules/module-alsa-sink.c
index 99e74bfc..47065659 100644
--- a/src/modules/module-alsa-sink.c
+++ b/src/modules/module-alsa-sink.c
@@ -324,19 +324,8 @@ int pa__init(pa_core *c, pa_module*m) {
}
ss = c->default_sample_spec;
- if (pa_modargs_get_sample_spec(ma, &ss) < 0) {
- pa_log(__FILE__": failed to parse sample specification");
- goto fail;
- }
-
- pa_alsa_channel_map_init_auto(&map, ss.channels);
- if ((pa_modargs_get_channel_map(ma, &map) < 0)) {
- pa_log(__FILE__": invalid channel map.");
- goto fail;
- }
-
- if (ss.channels != map.channels) {
- pa_log(__FILE__": channel map and sample specification don't match.");
+ if (pa_modargs_get_sample_spec_and_channel_map(ma, &ss, &map, PA_CHANNEL_MAP_ALSA) < 0) {
+ pa_log(__FILE__": failed to parse sample specification and channel map");
goto fail;
}