summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2006-04-26 16:50:36 +0000
committerLennart Poettering <lennart@poettering.net>2006-04-26 16:50:36 +0000
commit9564cefdbf856d9a4ea9d4f3a57a6f53ddcb7085 (patch)
treed9c2b1b9f868431eb6abb4e8264e36786a0b3a0b
parentc27b1407f8197230136158eae2aeb75f526a12f3 (diff)
fail if the channel map doesn't match the sample specs
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@810 fefdeb5f-60dc-0310-8127-8f9354f1896f
-rw-r--r--src/modules/module-combine.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/modules/module-combine.c b/src/modules/module-combine.c
index 543fffa4..47010497 100644
--- a/src/modules/module-combine.c
+++ b/src/modules/module-combine.c
@@ -367,6 +367,11 @@ int pa__init(pa_core *c, pa_module*m) {
pa_log(__FILE__": invalid channel map.");
goto fail;
}
+
+ if (ss.channels != map.channels) {
+ pa_log(__FILE__": channel map and sample specification don't match.");
+ goto fail;
+ }
if (!(u->sink = pa_sink_new(c, __FILE__, pa_modargs_get_value(ma, "sink_name", DEFAULT_SINK_NAME), 0, &ss, &map))) {
pa_log(__FILE__": failed to create sink");