Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Stephane Letz 2013-04-06 13:54:12 +02:00
commit 9d3524006a
1 changed files with 2 additions and 2 deletions

View File

@ -109,7 +109,7 @@ static int xrun_recovery(snd_pcm_t *handle, int err) {
if (err == -EPIPE) { /* under-run */
err = snd_pcm_prepare(handle);
if (err < 0)
printf("Can't recovery from underrun, prepare failed: %s\n", snd_strerror(err));
printf("Can't recover from underrun, prepare failed: %s\n", snd_strerror(err));
return 0;
} else if (err == -EAGAIN) {
while ((err = snd_pcm_resume(handle)) == -EAGAIN)
@ -117,7 +117,7 @@ static int xrun_recovery(snd_pcm_t *handle, int err) {
if (err < 0) {
err = snd_pcm_prepare(handle);
if (err < 0)
printf("Can't recovery from suspend, prepare failed: %s\n", snd_strerror(err));
printf("Can't recover from suspend, prepare failed: %s\n", snd_strerror(err));
}
return 0;
}