From b123cfa7c961080f32a1ff46e22d1c567bb52b0d Mon Sep 17 00:00:00 2001 From: Peter Meerwald Date: Wed, 13 Feb 2013 17:27:04 +0100 Subject: [PATCH] mix: Combine loops over streams in pa_mix() Signed-off-by: Peter Meerwald --- src/pulsecore/mix.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/pulsecore/mix.c b/src/pulsecore/mix.c index 73a09628..0db5f599 100644 --- a/src/pulsecore/mix.c +++ b/src/pulsecore/mix.c @@ -561,7 +561,6 @@ size_t pa_mix( pa_cvolume full_volume; unsigned k; - unsigned z; void *end; pa_assert(streams); @@ -577,12 +576,11 @@ size_t pa_mix( return length; } - for (k = 0; k < nstreams; k++) + for (k = 0; k < nstreams; k++) { streams[k].ptr = pa_memblock_acquire_chunk(&streams[k].chunk); - - for (z = 0; z < nstreams; z++) - if (length > streams[z].chunk.length) - length = streams[z].chunk.length; + if (length > streams[k].chunk.length) + length = streams[k].chunk.length; + } end = (uint8_t*) data + length; -- 2.39.2