From bfb281c7d53e00d433d0098f101ec8c354d03475 Mon Sep 17 00:00:00 2001 From: Tanu Kaskinen Date: Tue, 9 Apr 2013 14:52:54 +0300 Subject: mix: Mix the right number of streams Passing channels instead of nstreams to pa_mix_ch2_s16ne() caused that only the first two streams got mixed. BugLink: https://bugs.freedesktop.org/show_bug.cgi?id=63093 --- src/pulsecore/mix.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pulsecore/mix.c b/src/pulsecore/mix.c index 786ed75a..6ff6831a 100644 --- a/src/pulsecore/mix.c +++ b/src/pulsecore/mix.c @@ -249,7 +249,7 @@ static void pa_mix_s16ne_c(pa_mix_info streams[], unsigned nstreams, unsigned ch else if (nstreams == 2) pa_mix2_s16ne(streams, channels, data, length); else if (channels == 2) - pa_mix_ch2_s16ne(streams, channels, data, length); + pa_mix_ch2_s16ne(streams, nstreams, data, length); else pa_mix_generic_s16ne(streams, nstreams, channels, data, length); } -- cgit v1.2.3