correct a recording bug in native protocol

git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@181 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Lennart Poettering 2004-09-06 18:55:47 +00:00
parent 566e469bbe
commit 3536be420c
4 changed files with 11 additions and 8 deletions

View file

@ -14,6 +14,7 @@
- config file for command line arguments - config file for command line arguments
- vumeter - vumeter
- add FAQ - add FAQ
- pa_context_connect_spawn() change function to fork+exec+waitpid-like function
** later *** ** later ***
- xmlrpc/http - xmlrpc/http

View file

@ -398,11 +398,11 @@ mainloop_test_glib12_SOURCES = $(mainloop_test_SOURCES)
mainloop_test_glib12_CFLAGS = $(mainloop_test_CFLAGS) $(GLIB12_CFLAGS) -DGLIB_MAIN_LOOP mainloop_test_glib12_CFLAGS = $(mainloop_test_CFLAGS) $(GLIB12_CFLAGS) -DGLIB_MAIN_LOOP
mainloop_test_glib12_LDADD = $(mainloop_test_LDADD) $(GLIB12_LIBS) libpolyp-mainloop-glib12.la mainloop_test_glib12_LDADD = $(mainloop_test_LDADD) $(GLIB12_LIBS) libpolyp-mainloop-glib12.la
cpulimit_test_SOURCES = cpulimit-test.c cpulimit.c util.c cpulimit_test_SOURCES = cpulimit-test.c cpulimit.c util.c log.c
cpulimit_test_CFLAGS = $(AM_CFLAGS) cpulimit_test_CFLAGS = $(AM_CFLAGS)
cpulimit_test_LDADD = $(AM_LDADD) libpolyp-mainloop.la cpulimit_test_LDADD = $(AM_LDADD) libpolyp-mainloop.la
cpulimit_test2_SOURCES = cpulimit-test.c cpulimit.c util.c cpulimit_test2_SOURCES = cpulimit-test.c cpulimit.c util.c log.c
cpulimit_test2_CFLAGS = $(AM_CFLAGS) -DTEST2 cpulimit_test2_CFLAGS = $(AM_CFLAGS) -DTEST2
cpulimit_test2_LDADD = $(AM_LDADD) libpolyp-mainloop.la cpulimit_test2_LDADD = $(AM_LDADD) libpolyp-mainloop.la

View file

@ -378,12 +378,14 @@ static void send_memblock(struct connection *c) {
return; return;
if (pa_memblockq_peek(r->memblockq, &chunk) >= 0) { if (pa_memblockq_peek(r->memblockq, &chunk) >= 0) {
if (chunk.length > r->fragment_size) struct pa_memchunk schunk = chunk;
chunk.length = r->fragment_size;
if (schunk.length > r->fragment_size)
schunk.length = r->fragment_size;
pa_pstream_send_memblock(c->pstream, r->index, 0, &chunk); pa_pstream_send_memblock(c->pstream, r->index, 0, &schunk);
pa_memblockq_drop(r->memblockq, &chunk, chunk.length); pa_memblockq_drop(r->memblockq, &chunk, schunk.length);
pa_memblock_unref(chunk.memblock); pa_memblock_unref(schunk.memblock);
return; return;
} }

View file

@ -158,7 +158,7 @@ int pa_sink_render(struct pa_sink*s, size_t length, struct pa_memchunk *result)
unsigned n; unsigned n;
size_t l; size_t l;
assert(s && length && result); assert(s && length && result);
n = fill_mix_info(s, info, MAX_MIX_CHANNELS); n = fill_mix_info(s, info, MAX_MIX_CHANNELS);
if (n <= 0) if (n <= 0)