mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-04 13:29:59 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

sink: simplify silence checks

Browse source
This commit is contained in:
Wim Taymans 2009-10-29 12:47:42 +01:00 • committed by Lennart Poettering
parent 320d76f158
commit 973a4ebdba
1 changed files with 10 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/pulsecore/sink.c
View file

@ -926,7 +926,6 @@ void pa_sink_render(pa_sink*s, size_t length, pa_memchunk *result) {
pa_sw_cvolume_multiply(&volume, &s->thread_info.soft_volume, &info[0].volume); pa_sw_cvolume_multiply(&volume, &s->thread_info.soft_volume, &info[0].volume);
if (s->thread_info.soft_muted || !pa_cvolume_is_norm(&volume)) {
if (s->thread_info.soft_muted || pa_cvolume_is_muted(&volume)) { if (s->thread_info.soft_muted || pa_cvolume_is_muted(&volume)) {
pa_memblock_unref(result->memblock); pa_memblock_unref(result->memblock);
pa_silence_memchunk_get(&s->core->silence_cache, pa_silence_memchunk_get(&s->core->silence_cache,
@ -934,11 +933,10 @@ void pa_sink_render(pa_sink*s, size_t length, pa_memchunk *result) {
result, result,
&s->sample_spec, &s->sample_spec,
result->length); result->length);
} else { } else if (!pa_cvolume_is_norm(&volume)) {
pa_memchunk_make_writable(result, 0); pa_memchunk_make_writable(result, 0);
pa_volume_memchunk(result, &s->sample_spec, &volume); pa_volume_memchunk(result, &s->sample_spec, &volume);
} }
}
} else { } else {
void *ptr; void *ptr;
result->memblock = pa_memblock_new(s->core->mempool, length); result->memblock = pa_memblock_new(s->core->mempool, length);