projects
/
profile
/
ivi
/
pulseaudio.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c27b140
)
fail if the channel map doesn't match the sample specs
author
Lennart Poettering
<lennart@poettering.net>
Wed, 26 Apr 2006 16:50:36 +0000
(16:50 +0000)
committer
Lennart Poettering
<lennart@poettering.net>
Wed, 26 Apr 2006 16:50:36 +0000
(16:50 +0000)
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@810
fefdeb5f
-60dc-0310-8127-
8f9354f1896f
src/modules/module-combine.c
patch
|
blob
|
history
diff --git
a/src/modules/module-combine.c
b/src/modules/module-combine.c
index
543fffa
..
4701049
100644
(file)
--- 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");