diff options
| author | Eric Wong <normalperson@yhbt.net> | 2008-01-01 10:09:56 +0000 |
|---|---|---|
| committer | Eric Wong <normalperson@yhbt.net> | 2008-01-01 10:09:56 +0000 |
| commit | 2cc59816a6e6304e643bc5c7ca055dd2567cba9e (patch) | |
| tree | 2686ddfc3b7e98feb8a47e6f64c3658c15b92f0b /src/inputPlugins/mp3_plugin.c | |
| parent | 5e7367c580f3a7aca93f6523e6c9d37f81b1d48b (diff) | |
| download | mpd-2cc59816a6e6304e643bc5c7ca055dd2567cba9e.tar.gz mpd-2cc59816a6e6304e643bc5c7ca055dd2567cba9e.tar.xz mpd-2cc59816a6e6304e643bc5c7ca055dd2567cba9e.zip | |
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
Diffstat (limited to '')
| -rw-r--r-- | src/inputPlugins/mp3_plugin.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/src/inputPlugins/mp3_plugin.c b/src/inputPlugins/mp3_plugin.c index dc9e04e5f..8a9dfad5c 100644 --- a/src/inputPlugins/mp3_plugin.c +++ b/src/inputPlugins/mp3_plugin.c @@ -1028,14 +1028,10 @@ static int mp3_decode(OutputBuffer * cb, DecoderControl * dc, if (openMp3FromInputStream(inStream, &data, dc, &tag, &replayGainInfo) < 0) { - closeInputStream(inStream); if (!dc->stop) { ERROR ("Input does not appear to be a mp3 bit stream.\n"); return -1; - } else { - dc->state = DECODE_STATE_STOP; - dc->stop = 0; } return 0; } @@ -1089,8 +1085,6 @@ static int mp3_decode(OutputBuffer * cb, DecoderControl * dc, if (replayGainInfo) freeReplayGainInfo(replayGainInfo); - closeInputStream(inStream); - if (dc->seek && data.muteFrame == MUTEFRAME_SEEK) { clearOutputBuffer(cb); dc->seek = 0; @@ -1099,12 +1093,6 @@ static int mp3_decode(OutputBuffer * cb, DecoderControl * dc, flushOutputBuffer(cb); mp3DecodeDataFinalize(&data); - if (dc->stop) { - dc->state = DECODE_STATE_STOP; - dc->stop = 0; - } else - dc->state = DECODE_STATE_STOP; - return 0; } |