[polypaudio-commits] r810 - /trunk/src/modules/module-combine.c

[svnmailer-noreply at 0pointer.de]

Author: lennart
Date: Wed Apr 26 18:50:36 2006
New Revision: 810

URL: http://0pointer.de/cgi-bin/viewcvs.cgi?rev=810&root=polypaudio&view=rev
Log:
fail if the channel map doesn't match the sample specs

Modified:
    trunk/src/modules/module-combine.c

Modified: trunk/src/modules/module-combine.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/module-combine.c?rev=810&root=polypaudio&r1=809&r2=810&view=diff
==============================================================================
--- trunk/src/modules/module-combine.c (original)
+++ trunk/src/modules/module-combine.c Wed Apr 26 18:50:36 2006
@@ -367,6 +367,11 @@
         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");