[pulseaudio-discuss] [PATCH RFCv3 41/51] mix: pa_mix() is always called with more than one steam

Peter Meerwald pmeerw at pmeerw.net
Tue Nov 4 15:26:36 PST 2014


Signed-off-by: Peter Meerwald <pmeerw at pmeerw.net>
---
 src/pulsecore/mix.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/pulsecore/mix.c b/src/pulsecore/mix.c
index 436e46f..ae87ec9 100644
--- a/src/pulsecore/mix.c
+++ b/src/pulsecore/mix.c
@@ -630,11 +630,12 @@ size_t pa_mix(
     pa_assert(data);
     pa_assert(length);
     pa_assert(spec);
+    pa_assert(nstreams > 1);
 
     if (!volume)
         volume = pa_cvolume_reset(&full_volume, spec->channels);
 
-    if (mute || pa_cvolume_is_muted(volume) || nstreams <= 0) {
+    if (mute || pa_cvolume_is_muted(volume)) {
         pa_silence_memory(data, length, spec);
         return length;
     }
-- 
1.9.1



More information about the pulseaudio-discuss mailing list