From f0616367b32fbe993c4d0edb0457b10d241137a2 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Sat, 23 Jun 2007 20:03:00 +0000 Subject: drop silence generation from sink drivers git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/lennart@1488 fefdeb5f-60dc-0310-8127-8f9354f1896f --- src/modules/module-null-sink.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'src') diff --git a/src/modules/module-null-sink.c b/src/modules/module-null-sink.c index afe130d9..3e471d41 100644 --- a/src/modules/module-null-sink.c +++ b/src/modules/module-null-sink.c @@ -140,7 +140,7 @@ static void thread_func(void *userdata) { pa_asyncmsgq_done(u->asyncmsgq, 0); goto finish; } - + ret = pa_asyncmsgq_dispatch(object, code, data, &chunk); pa_asyncmsgq_done(u->asyncmsgq, ret); continue; @@ -151,15 +151,11 @@ static void thread_func(void *userdata) { pa_gettimeofday(&now); if (pa_timeval_cmp(&u->timestamp, &now) <= 0) { - size_t l; - if (pa_sink_render(u->sink, u->block_size, &chunk) >= 0) { - l = chunk.length; - pa_memblock_unref(chunk.memblock); - } else - l = u->block_size; + pa_sink_render(u->sink, u->block_size, &chunk); + pa_memblock_unref(chunk.memblock); - pa_timeval_add(&u->timestamp, pa_bytes_to_usec(l, &u->sink->sample_spec)); + pa_timeval_add(&u->timestamp, pa_bytes_to_usec(chunk.length, &u->sink->sample_spec)); continue; } -- cgit