diff options
| author | Wim Taymans <wim.taymans@collabora.co.uk> | 2009-10-29 12:47:42 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2009-11-11 05:14:56 +0100 |
| commit | 973a4ebdba1eb229c664889ffef9b4e557d7a9b1 (patch) | |
| tree | c1a747c539a31a75e2309980ef473715c35bf6eb | |
| parent | 320d76f1581c40b05c359936a755126f38b1b0c9 (diff) | |
sink: simplify silence checks
| -rw-r--r-- | src/pulsecore/sink.c | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/src/pulsecore/sink.c b/src/pulsecore/sink.c index bda92fcc..e6d718f7 100644 --- a/src/pulsecore/sink.c +++ b/src/pulsecore/sink.c @@ -926,18 +926,16 @@ 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); - if (s->thread_info.soft_muted || !pa_cvolume_is_norm(&volume)) { - if (s->thread_info.soft_muted || pa_cvolume_is_muted(&volume)) { - pa_memblock_unref(result->memblock); - pa_silence_memchunk_get(&s->core->silence_cache, - s->core->mempool, - result, - &s->sample_spec, - result->length); - } else { - pa_memchunk_make_writable(result, 0); - pa_volume_memchunk(result, &s->sample_spec, &volume); - } + if (s->thread_info.soft_muted || pa_cvolume_is_muted(&volume)) { + pa_memblock_unref(result->memblock); + pa_silence_memchunk_get(&s->core->silence_cache, + s->core->mempool, + result, + &s->sample_spec, + result->length); + } else if (!pa_cvolume_is_norm(&volume)) { + pa_memchunk_make_writable(result, 0); + pa_volume_memchunk(result, &s->sample_spec, &volume); } } else { void *ptr; |