modplug: use only decoder_read(), not input_stream_read()

You are allowed to call decoder_read() with decoder==NULL. It is a convenience function provided by the decoder API. Don't manually fall back to input_stream_read().

modplug: use only decoder_read(), not input_stream_read()
24d4c2df · Max Kellermann · e6cb939a · 24d4c2df
Commit 24d4c2df authored Jan 24, 2009 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 5 deletions

modplug_plugin.c src/decoder/modplug_plugin.c +1 -5

No files found.
--- a/src/decoder/modplug_plugin.c
+++ b/src/decoder/modplug_plugin.c
@@ -48,11 +48,7 @@ static GByteArray *mod_loadfile(struct decoder *decoder, struct input_stream *is
 	data = g_malloc(MODPLUG_READ_BLOCK);
 	total_len = 0;
 	do {
-		if (decoder) {
-			ret = decoder_read(decoder, is, data, MODPLUG_READ_BLOCK);
-		} else {
-			ret = input_stream_read(is, data, MODPLUG_READ_BLOCK);
-		}
+		ret = decoder_read(decoder, is, data, MODPLUG_READ_BLOCK);
 		if (ret > 0) {
 			g_byte_array_append(bdatas, data, ret);
 			total_len += ret;