mirror of
https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git
synced 2025-11-06 13:29:56 -05:00
Revert r1404 and keep it on a development branch until it is fully tested.
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@1409 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
parent
6ca819354c
commit
8dc6214276
36 changed files with 499 additions and 990 deletions
|
|
@ -59,27 +59,24 @@ int main(PA_GCC_UNUSED int argc, PA_GCC_UNUSED char *argv[]) {
|
|||
c.index = c.length = 0;
|
||||
}
|
||||
|
||||
assert(c.index < pa_memblock_get_length(c.memblock));
|
||||
assert(c.index < c.memblock->length);
|
||||
|
||||
l = pa_memblock_get_length(c.memblock) - c.index;
|
||||
l = c.memblock->length - c.index;
|
||||
|
||||
l = l <= 1 ? l : rand() % (l-1) +1 ;
|
||||
|
||||
p = pa_memblock_acquire(c.memblock);
|
||||
if ((r = read(STDIN_FILENO, (uint8_t*) p + c.index, l)) <= 0) {
|
||||
pa_memblock_release(c.memblock);
|
||||
|
||||
if ((r = read(STDIN_FILENO, (uint8_t*) c.memblock->data + c.index, l)) <= 0) {
|
||||
fprintf(stderr, "read() failed: %s\n", r < 0 ? strerror(errno) : "EOF");
|
||||
break;
|
||||
}
|
||||
pa_memblock_release(c.memblock);
|
||||
|
||||
|
||||
c.length = r;
|
||||
pa_mcalign_push(a, &c);
|
||||
fprintf(stderr, "Read %ld bytes\n", (long)r);
|
||||
|
||||
c.index += r;
|
||||
|
||||
if (c.index >= pa_memblock_get_length(c.memblock)) {
|
||||
if (c.index >= c.memblock->length) {
|
||||
pa_memblock_unref(c.memblock);
|
||||
pa_memchunk_reset(&c);
|
||||
}
|
||||
|
|
@ -90,9 +87,7 @@ int main(PA_GCC_UNUSED int argc, PA_GCC_UNUSED char *argv[]) {
|
|||
if (pa_mcalign_pop(a, &t) < 0)
|
||||
break;
|
||||
|
||||
p = pa_memblock_acquire(t.memblock);
|
||||
pa_loop_write(STDOUT_FILENO, (uint8_t*) p + t.index, t.length, NULL);
|
||||
pa_memblock_release(t.memblock);
|
||||
pa_loop_write(STDOUT_FILENO, (uint8_t*) t.memblock->data + t.index, t.length, NULL);
|
||||
fprintf(stderr, "Wrote %lu bytes.\n", (unsigned long) t.length);
|
||||
|
||||
pa_memblock_unref(t.memblock);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue