From 06de6393d1426110c2b0d20a6bbc2685c2138e25 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Thu, 15 Jan 2009 00:07:38 +0100 Subject: don't rely on PA_SINK_RUNNING vs. PA_SINK_IDLE for optimizations since it might not be fully up to date --- src/pulsecore/sink.c | 10 ++++------ src/pulsecore/source.c | 6 ------ 2 files changed, 4 insertions(+), 12 deletions(-) (limited to 'src/pulsecore') diff --git a/src/pulsecore/sink.c b/src/pulsecore/sink.c index 48c8f794..3a662383 100644 --- a/src/pulsecore/sink.c +++ b/src/pulsecore/sink.c @@ -642,7 +642,7 @@ void pa_sink_render(pa_sink*s, size_t length, pa_memchunk *result) { pa_assert(length > 0); - n = s->thread_info.state == PA_SINK_RUNNING ? fill_mix_info(s, &length, info, MAX_MIX_CHANNELS) : 0; + n = fill_mix_info(s, &length, info, MAX_MIX_CHANNELS); if (n == 0) { @@ -685,8 +685,7 @@ void pa_sink_render(pa_sink*s, size_t length, pa_memchunk *result) { result->index = 0; } - if (s->thread_info.state == PA_SINK_RUNNING) - inputs_drop(s, info, n, result); + inputs_drop(s, info, n, result); pa_sink_unref(s); } @@ -716,7 +715,7 @@ void pa_sink_render_into(pa_sink*s, pa_memchunk *target) { pa_assert(length > 0); - n = s->thread_info.state == PA_SINK_RUNNING ? fill_mix_info(s, &length, info, MAX_MIX_CHANNELS) : 0; + n = fill_mix_info(s, &length, info, MAX_MIX_CHANNELS); if (n == 0) { if (target->length > length) @@ -765,8 +764,7 @@ void pa_sink_render_into(pa_sink*s, pa_memchunk *target) { pa_memblock_release(target->memblock); } - if (s->thread_info.state == PA_SINK_RUNNING) - inputs_drop(s, info, n, target); + inputs_drop(s, info, n, target); pa_sink_unref(s); } diff --git a/src/pulsecore/source.c b/src/pulsecore/source.c index e65c5ce7..dee6f3d5 100644 --- a/src/pulsecore/source.c +++ b/src/pulsecore/source.c @@ -429,9 +429,6 @@ void pa_source_post(pa_source*s, const pa_memchunk *chunk) { pa_assert(PA_SOURCE_IS_OPENED(s->thread_info.state)); pa_assert(chunk); - if (s->thread_info.state != PA_SOURCE_RUNNING) - return; - if (s->thread_info.soft_muted || !pa_cvolume_is_norm(&s->thread_info.soft_volume)) { pa_memchunk vchunk = *chunk; @@ -470,9 +467,6 @@ void pa_source_post_direct(pa_source*s, pa_source_output *o, const pa_memchunk * pa_assert(o->thread_info.direct_on_input); pa_assert(chunk); - if (s->thread_info.state != PA_SOURCE_RUNNING) - return; - if (s->thread_info.soft_muted || !pa_cvolume_is_norm(&s->thread_info.soft_volume)) { pa_memchunk vchunk = *chunk; -- cgit