aboutsummaryrefslogtreecommitdiffstats
path: root/src/decoder_api.c
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2011-09-14 09:37:52 +0200
committerMax Kellermann <max@duempel.org>2011-09-14 09:41:27 +0200
commitc344d63fb38c5d5aec4ad11815762e7ba1a13a31 (patch)
treebb50cefcd1bbe4f2b7210cb9b3ee28461caee529 /src/decoder_api.c
parent62557f4d6b72eed3c42f17da89e11e3327151b88 (diff)
downloadmpd-c344d63fb38c5d5aec4ad11815762e7ba1a13a31.tar.gz
mpd-c344d63fb38c5d5aec4ad11815762e7ba1a13a31.tar.xz
mpd-c344d63fb38c5d5aec4ad11815762e7ba1a13a31.zip
decoder_internal: don't call input_stream_buffer()
This is not necessary since all relevant input plugins have been moved to the I/O thread, and there is no remaining useful buffer() implementation. This also fixes a busy loop when playing radio.
Diffstat (limited to '')
-rw-r--r--src/decoder_api.c15
1 files changed, 7 insertions, 8 deletions
diff --git a/src/decoder_api.c b/src/decoder_api.c
index 5536552e5..239ef6daf 100644
--- a/src/decoder_api.c
+++ b/src/decoder_api.c
@@ -202,8 +202,7 @@ decoder_timestamp(struct decoder *decoder, double t)
* (decoder.chunk) if there is one.
*/
static enum decoder_command
-do_send_tag(struct decoder *decoder, struct input_stream *is,
- const struct tag *tag)
+do_send_tag(struct decoder *decoder, const struct tag *tag)
{
struct music_chunk *chunk;
@@ -216,7 +215,7 @@ do_send_tag(struct decoder *decoder, struct input_stream *is,
assert(decoder->chunk == NULL);
- chunk = decoder_get_chunk(decoder, is);
+ chunk = decoder_get_chunk(decoder);
if (chunk == NULL) {
assert(decoder->dc->command != DECODE_COMMAND_NONE);
return decoder->dc->command;
@@ -283,11 +282,11 @@ decoder_data(struct decoder *decoder,
tag = tag_merge(decoder->decoder_tag,
decoder->stream_tag);
- cmd = do_send_tag(decoder, is, tag);
+ cmd = do_send_tag(decoder, tag);
tag_free(tag);
} else
/* send only the stream tag */
- cmd = do_send_tag(decoder, is, decoder->stream_tag);
+ cmd = do_send_tag(decoder, decoder->stream_tag);
if (cmd != DECODE_COMMAND_NONE)
return cmd;
@@ -313,7 +312,7 @@ decoder_data(struct decoder *decoder,
size_t nbytes;
bool full;
- chunk = decoder_get_chunk(decoder, is);
+ chunk = decoder_get_chunk(decoder);
if (chunk == NULL) {
assert(dc->command != DECODE_COMMAND_NONE);
return dc->command;
@@ -392,11 +391,11 @@ decoder_tag(G_GNUC_UNUSED struct decoder *decoder, struct input_stream *is,
struct tag *merged;
merged = tag_merge(decoder->stream_tag, decoder->decoder_tag);
- cmd = do_send_tag(decoder, is, merged);
+ cmd = do_send_tag(decoder, merged);
tag_free(merged);
} else
/* send only the decoder tag */
- cmd = do_send_tag(decoder, is, tag);
+ cmd = do_send_tag(decoder, tag);
return cmd;
}