input_stream: non-blocking I/O
Add GMutex, GCond attributes which will be used by callers to conditionally wait on the stream. Remove the (now-useless) plugin method buffer(), wait on GCond instead. Lock the input_stream before each method call. Do the same with the playlist plugins.
This commit is contained in:
@@ -80,7 +80,7 @@ static int ogg_seek_cb(void *data, ogg_int64_t offset, int whence)
|
||||
|
||||
return vis->seekable &&
|
||||
(!vis->decoder || decoder_get_command(vis->decoder) != DECODE_COMMAND_STOP) &&
|
||||
input_stream_seek(vis->input_stream, offset, whence, NULL)
|
||||
input_stream_lock_seek(vis->input_stream, offset, whence, NULL)
|
||||
? 0 : -1;
|
||||
}
|
||||
|
||||
@@ -290,7 +290,7 @@ vorbis_stream_decode(struct decoder *decoder,
|
||||
|
||||
/* rewind the stream, because ogg_stream_type_detect() has
|
||||
moved it */
|
||||
input_stream_seek(input_stream, 0, SEEK_SET, NULL);
|
||||
input_stream_lock_seek(input_stream, 0, SEEK_SET, NULL);
|
||||
|
||||
if (!vorbis_is_open(&vis, &vf, decoder, input_stream))
|
||||
return;
|
||||
|
||||
Reference in New Issue
Block a user