asgardius/alsa-utils
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-utils synced 2024-12-22 23:36:30 +01:00
Code Issues Projects Releases Packages Wiki Activity

Revert "aplay: fix pcm_read() return value"

Browse source 
This reverts commit 8aa13eec80.

The semantics for pcm_read() and pcm_readv() was changed, but the
callers expect the exact frame count as requested. It's possible
to fix callers, but the fix is more complicated than to revert the
change. Note that '-d' processing was broken in some cases.

Note: The reverted commit allows that the return value might be
greater than requested (see the first condition in read routines).
This commit is contained in:
Jaroslav Kysela 2014-10-01 15:43:57 +02:00
parent 89a4f490bd
commit 8f361d83cf
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
aplay/aplay.c
View file

@ -2039,7 +2039,7 @@ static ssize_t pcm_read(u_char *data, size_t rcount)
data += r * bits_per_frame / 8; data += r * bits_per_frame / 8;
} }
} }
return result; return rcount;
} }
static ssize_t pcm_readv(u_char **data, unsigned int channels, size_t rcount) static ssize_t pcm_readv(u_char **data, unsigned int channels, size_t rcount)
@ -2084,7 +2084,7 @@ static ssize_t pcm_readv(u_char **data, unsigned int channels, size_t rcount)
count -= r; count -= r;
} }
} }
return result; return rcount;
} }
/* /*