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/playlist/pls_playlist_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/playlist/pls_playlist_plugin.c')
| -rw-r--r-- | src/playlist/pls_playlist_plugin.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/playlist/pls_playlist_plugin.c b/src/playlist/pls_playlist_plugin.c index 937f02791..c4e5492af 100644 --- a/src/playlist/pls_playlist_plugin.c +++ b/src/playlist/pls_playlist_plugin.c @@ -115,7 +115,8 @@ pls_open_stream(struct input_stream *is) GString *kf_data = g_string_new(""); do { - nbytes = input_stream_read(is, buffer, sizeof(buffer), &error); + nbytes = input_stream_lock_read(is, buffer, sizeof(buffer), + &error); if (nbytes == 0) { if (error != NULL) { g_string_free(kf_data, TRUE); |