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

output_api: play() returns a length

Browse Source 
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.
This commit is contained in:
Max Kellermann
2009-02-23 09:29:56 +01:00
parent d50a3d513e
commit 5a898c15e7
12 changed files with 102 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/output/alsa_plugin.c
+10 -19
View File
@@ -441,7 +441,7 @@ alsa_close(void *data)
mixer_close(ad->mixer);
}
static bool
static size_t
alsa_play(void *data, const char *chunk, size_t size)
{
struct alsa_data *ad = data;
@@ -449,28 +449,19 @@ alsa_play(void *data, const char *chunk, size_t size)
size /= ad->frame_size;
while (size > 0) {
while (true) {
ret = ad->writei(ad->pcm, chunk, size);
if (ret > 0)
return ret * ad->frame_size;
if (ret == -EAGAIN || ret == -EINTR)
continue;
if (ret < 0) {
if (alsa_recover(ad, ret) < 0) {
g_warning("closing ALSA device \"%s\" due to write "
"error: %s\n",
alsa_device(ad), snd_strerror(-errno));
return false;
}
continue;
if (ret < 0 && ret != -EAGAIN && ret != -EINTR &&
alsa_recover(ad, ret) < 0) {
g_warning("closing ALSA device \"%s\" due to write "
"error: %s\n",
alsa_device(ad), snd_strerror(-errno));
return 0;
}
chunk += ret * ad->frame_size;
size -= ret;
}
return true;
}
const struct audio_output_plugin alsaPlugin = {