From 2cc59816a6e6304e643bc5c7ca055dd2567cba9e Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Tue, 1 Jan 2008 10:09:56 +0000 Subject: Simplify decode cleanup logic a bit DECODE_STATE_STOP is always set as dc->state, and dc->stop is always cleared. So handle it in decodeStart once rather than doing it in every plugin. While we're at it, fix a long-standing (but difficult to trigger) bug in mpc_decode where we failed to return if mpc_decoder_initialize() fails. git-svn-id: https://svn.musicpd.org/mpd/trunk@7122 09075e82-0dd4-0310-85a5-a0d7c8717e4f --- src/inputPlugins/wavpack_plugin.c | 4 ---- 1 file changed, 4 deletions(-) (limited to 'src/inputPlugins/wavpack_plugin.c') diff --git a/src/inputPlugins/wavpack_plugin.c b/src/inputPlugins/wavpack_plugin.c index ec1e6a348..97fbc37f9 100644 --- a/src/inputPlugins/wavpack_plugin.c +++ b/src/inputPlugins/wavpack_plugin.c @@ -218,9 +218,6 @@ static void wavpack_decode(OutputBuffer *cb, DecoderControl *dc, } while (samplesgot == samplesreq); flushOutputBuffer(cb); - - dc->state = DECODE_STATE_STOP; - dc->stop = 0; } static char *wavpack_tag(WavpackContext *wpc, char *key) @@ -450,7 +447,6 @@ static int wavpack_streamdecode(OutputBuffer *cb, DecoderControl *dc, wavpack_decode(cb, dc, wpc, can_seek(is), NULL); WavpackCloseFile(wpc); - closeInputStream(is); /* calling side doesn't do this in mpd 0.13.0 */ return 0; } -- cgit v1.2.3