]> code.delx.au - pulseaudio/commitdiff
mix: Combine loops over streams in pa_mix()
authorPeter Meerwald <pmeerw@pmeerw.net>
Wed, 13 Feb 2013 16:27:04 +0000 (17:27 +0100)
committerTanu Kaskinen <tanuk@iki.fi>
Fri, 15 Feb 2013 19:34:09 +0000 (21:34 +0200)
Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
src/pulsecore/mix.c

index 73a096282afa4c2c9b5cb810dc8e763f9b062113..0db5f599c11e467990b0fdfd25aa7798bf1052b2 100644 (file)
@@ -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;