mix: pa_mix() is always called with more than one steam

Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
This commit is contained in:
Peter Meerwald 2014-11-02 17:22:19 +01:00
parent ea5cbec0b7
commit 3963fc5e5b

View file

@ -630,11 +630,12 @@ size_t pa_mix(
pa_assert(data); pa_assert(data);
pa_assert(length); pa_assert(length);
pa_assert(spec); pa_assert(spec);
pa_assert(nstreams > 1);
if (!volume) if (!volume)
volume = pa_cvolume_reset(&full_volume, spec->channels); 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); pa_silence_memory(data, length, spec);
return length; return length;
} }