diff options
| author | Max Kellermann <max@duempel.org> | 2011-09-14 21:46:41 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2011-09-16 21:22:13 +0200 |
| commit | 754f26a97c816781e80500d98f2515ae97836145 (patch) | |
| tree | caa7dbaa879b29d018a4559524390670ad33a605 /src/decoder/vorbis_decoder_plugin.c | |
| parent | 29241c4f835797f635816a9f37528aa981f722b5 (diff) | |
| download | mpd-754f26a97c816781e80500d98f2515ae97836145.tar.gz mpd-754f26a97c816781e80500d98f2515ae97836145.tar.xz mpd-754f26a97c816781e80500d98f2515ae97836145.zip | |
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.
Diffstat (limited to 'src/decoder/vorbis_decoder_plugin.c')
| -rw-r--r-- | src/decoder/vorbis_decoder_plugin.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/decoder/vorbis_decoder_plugin.c b/src/decoder/vorbis_decoder_plugin.c index c130005a7..f73a41895 100644 --- a/src/decoder/vorbis_decoder_plugin.c +++ b/src/decoder/vorbis_decoder_plugin.c @@ -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; |