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

input_stream: return errors with GError

Browse Source
This commit is contained in:
Max Kellermann
2009-11-14 23:53:04 +01:00
parent d000d31355
commit 228b03edf8
36 changed files with 422 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/decoder/sndfile_decoder_plugin.c
View File

@@ -40,7 +40,7 @@ sndfile_vio_seek(sf_count_t offset, int whence, void *user_data)
struct input_stream *is = user_data;
bool success;
success = input_stream_seek(is, offset, whence);
success = input_stream_seek(is, offset, whence, NULL);
if (!success)
return -1;
@@ -51,11 +51,15 @@ static sf_count_t
sndfile_vio_read(void *ptr, sf_count_t count, void *user_data)
{
struct input_stream *is = user_data;
GError *error = NULL;
size_t nbytes;
nbytes = input_stream_read(is, ptr, count);
if (nbytes == 0 && is->error != 0)
nbytes = input_stream_read(is, ptr, count, &error);
if (nbytes == 0 && error != NULL) {
g_warning("%s", error->message);
g_error_free(error);
return -1;
}
return nbytes;
}