From 0db3308cb56a1589b427f3b712d66480bc4d788f Mon Sep 17 00:00:00 2001 From: Jeffrey Goode Date: Wed, 11 Nov 2009 07:02:18 +0000 Subject: pcmbuf: bug fix with pcmbuf flush, code cleanup, added comments git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23608 a1c6a512-1295-4272-9138-f99709370657 --- apps/codec_thread.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'apps/codec_thread.c') diff --git a/apps/codec_thread.c b/apps/codec_thread.c index dc6533d..21d55a7 100644 --- a/apps/codec_thread.c +++ b/apps/codec_thread.c @@ -168,7 +168,7 @@ static void* codec_get_buffer(size_t *size) return &codecbuf[codec_size]; } -static bool codec_pcmbuf_insert_callback( +static void codec_pcmbuf_insert_callback( const void *ch1, const void *ch2, int count) { const char *src[2] = { ch1, ch2 }; @@ -181,14 +181,14 @@ static bool codec_pcmbuf_insert_callback( /* Prevent audio from a previous track from playing */ if (ci.new_track || ci.stop_codec) - return true; + return; while ((dest = pcmbuf_request_buffer(&out_count)) == NULL) { cancel_cpu_boost(); sleep(1); if (ci.seek_time || ci.new_track || ci.stop_codec) - return true; + return; } /* Get the real input_size for output_size bytes, guarding @@ -196,7 +196,7 @@ static bool codec_pcmbuf_insert_callback( inp_count = dsp_input_count(ci.dsp, out_count); if (inp_count <= 0) - return true; + return; /* Input size has grown, no error, just don't write more than length */ if (inp_count > count) @@ -205,14 +205,12 @@ static bool codec_pcmbuf_insert_callback( out_count = dsp_process(ci.dsp, dest, src, inp_count); if (out_count <= 0) - return true; + return; pcmbuf_write_complete(out_count); count -= inp_count; } - - return true; } /* codec_pcmbuf_insert_callback */ static void codec_set_elapsed_callback(unsigned long value) -- cgit v1.1