oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

decoder_api: remove the loop from decoder_read()

Browse Source 
This was useless, because input_stream_read() blocks until data is
available.  Calling it in a loop doesn't make sense.
This commit is contained in:
Max Kellermann 2011-09-16 08:04:02 +02:00
parent 7b88089593
commit 9ea8a840a9
1 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/decoder_api.c
View File

@ -183,25 +183,19 @@ size_t decoder_read(struct decoder *decoder,
if (length == 0) if (length == 0)
return 0; return 0;
while (true) { if (decoder_check_cancel_read(decoder))
if (decoder_check_cancel_read(decoder)) return 0;
return 0;
nbytes = input_stream_read(is, buffer, length, &error); nbytes = input_stream_read(is, buffer, length, &error);
assert(nbytes == 0 || error == NULL);
assert(nbytes > 0 || error != NULL || input_stream_eof(is));
if (G_UNLIKELY(nbytes == 0 && error != NULL)) { if (G_UNLIKELY(nbytes == 0 && error != NULL)) {
g_warning("%s", error->message); g_warning("%s", error->message);
g_error_free(error); g_error_free(error);
return 0;
}
if (nbytes > 0 || input_stream_eof(is))
return nbytes;
/* sleep for a fraction of a second! */
/* XXX don't sleep, wait for an event instead */
g_usleep(10000);
} }
return nbytes;
} }
void void