diff options
author | Max Kellermann <max@duempel.org> | 2009-02-23 09:29:56 +0100 |
---|---|---|
committer | Max Kellermann <max@duempel.org> | 2009-02-23 09:29:56 +0100 |
commit | 5a898c15e79ab87d2466e61549fcc20ce115c67e (patch) | |
tree | cb65b88718b0b8f3cf05221816b193833c41fe8a /src/output/mvp_plugin.c | |
parent | d50a3d513eb0452e762f1e4eeb717318958cd83c (diff) | |
download | mpd-5a898c15e79ab87d2466e61549fcc20ce115c67e.tar.gz mpd-5a898c15e79ab87d2466e61549fcc20ce115c67e.tar.xz mpd-5a898c15e79ab87d2466e61549fcc20ce115c67e.zip |
output_api: play() returns a length
The old API required an output plugin to not return until all data
passed to the play() method is consumed. Some output plugins have to
loop to fulfill that requirement, and may block during that. Simplify
these, by letting them consume only part of the buffer: make play()
return the length of the consumed data.
Diffstat (limited to 'src/output/mvp_plugin.c')
-rw-r--r-- | src/output/mvp_plugin.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/output/mvp_plugin.c b/src/output/mvp_plugin.c index cb570c8ee..840661ea7 100644 --- a/src/output/mvp_plugin.c +++ b/src/output/mvp_plugin.c @@ -248,7 +248,7 @@ static void mvp_dropBufferedAudio(void *data) } } -static bool +static size_t mvp_playAudio(void *data, const char *playChunk, size_t size) { MvpData *md = data; @@ -258,19 +258,19 @@ mvp_playAudio(void *data, const char *playChunk, size_t size) if (md->fd < 0) mvp_openDevice(md, &md->audio_format); - while (size > 0) { + while (true) { ret = write(md->fd, playChunk, size); + if (ret > 0) + return (size_t)ret; + if (ret < 0) { if (errno == EINTR) continue; g_warning("closing mvp PCM device due to write error: " "%s\n", strerror(errno)); - return false; + return 0; } - playChunk += ret; - size -= ret; } - return true; } const struct audio_output_plugin mvpPlugin = { |