aboutsummaryrefslogtreecommitdiffstats
path: root/src/decoder/mp3_plugin.c
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2008-10-29 17:28:47 +0100
committerMax Kellermann <max@duempel.org>2008-10-29 17:28:47 +0100
commitbe90199c5ace71eb3411294159fec6adcc0d4404 (patch)
treeaac2bed6180a800b9270427a1242ba356aed8ff3 /src/decoder/mp3_plugin.c
parentd6c4441c785d5ae41feba865727fd7ecdfbad361 (diff)
downloadmpd-be90199c5ace71eb3411294159fec6adcc0d4404.tar.gz
mpd-be90199c5ace71eb3411294159fec6adcc0d4404.tar.xz
mpd-be90199c5ace71eb3411294159fec6adcc0d4404.zip
decoder_api: removed decoder_clear()
Call ob_clear() in decoder_command_finished() instead of implementing that call in every decoder plugin.
Diffstat (limited to 'src/decoder/mp3_plugin.c')
-rw-r--r--src/decoder/mp3_plugin.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/decoder/mp3_plugin.c b/src/decoder/mp3_plugin.c
index d001efbda..8c56319f8 100644
--- a/src/decoder/mp3_plugin.c
+++ b/src/decoder/mp3_plugin.c
@@ -1018,7 +1018,6 @@ mp3_read(struct mp3_data *data, ReplayGainInfo **replay_gain_info_r)
decoder_seek_where(decoder));
if (j < data->highest_frame) {
if (mp3_seek(data, data->frame_offsets[j])) {
- decoder_clear(decoder);
data->current_frame = j;
decoder_command_finished(decoder);
} else
@@ -1026,7 +1025,6 @@ mp3_read(struct mp3_data *data, ReplayGainInfo **replay_gain_info_r)
} else {
data->seek_where = decoder_seek_where(decoder);
data->mute_frame = MUTEFRAME_SEEK;
- decoder_clear(decoder);
decoder_command_finished(decoder);
}
}
@@ -1130,10 +1128,8 @@ mp3_decode(struct decoder *decoder, struct input_stream *input_stream)
freeReplayGainInfo(replay_gain_info);
if (decoder_get_command(decoder) == DECODE_COMMAND_SEEK &&
- data.mute_frame == MUTEFRAME_SEEK) {
- decoder_clear(decoder);
+ data.mute_frame == MUTEFRAME_SEEK)
decoder_command_finished(decoder);
- }
decoder_flush(decoder);
mp3_data_finish(&data);