diff options
| author | Lennart Poettering <lennart@poettering.net> | 2007-07-25 14:46:40 +0000 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2007-07-25 14:46:40 +0000 |
| commit | 068f5d5eef1cab3615f9899e0e458d59e54e95a2 (patch) | |
| tree | b8ad9fd7fac81028220bf3cb561f7f8a85d2e994 /src/modules | |
| parent | 9cc20b46b7f8eba94f52a563e7781aff90274bef (diff) | |
drop chunk argument from various drop() functions, since it doesn't make any sense if we want to guarantee always monotonously increasing read pointers; a couple of other fixes
git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/lennart@1529 fefdeb5f-60dc-0310-8127-8f9354f1896f
Diffstat (limited to 'src/modules')
| -rw-r--r-- | src/modules/module-sine.c | 7 | ||||
| -rw-r--r-- | src/modules/rtp/rtp.c | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/modules/module-sine.c b/src/modules/module-sine.c index b5b7e60b..a784f218 100644 --- a/src/modules/module-sine.c +++ b/src/modules/module-sine.c @@ -73,14 +73,13 @@ static int sink_input_peek_cb(pa_sink_input *i, pa_memchunk *chunk) { return 0; } -static void sink_input_drop_cb(pa_sink_input *i, const pa_memchunk *chunk, size_t length) { +static void sink_input_drop_cb(pa_sink_input *i, size_t length) { struct userdata *u; size_t l; pa_assert(i); u = i->userdata; pa_assert(u); - pa_assert(chunk); pa_assert(length > 0); u->peek_index += length; @@ -93,8 +92,10 @@ static void sink_input_drop_cb(pa_sink_input *i, const pa_memchunk *chunk, size_ static void sink_input_kill_cb(pa_sink_input *i) { struct userdata *u; - pa_assert(i && i->userdata); + + pa_assert(i); u = i->userdata; + pa_assert(u); pa_sink_input_disconnect(u->sink_input); pa_sink_input_unref(u->sink_input); diff --git a/src/modules/rtp/rtp.c b/src/modules/rtp/rtp.c index f0ab7d8a..31dec653 100644 --- a/src/modules/rtp/rtp.c +++ b/src/modules/rtp/rtp.c @@ -90,7 +90,7 @@ int pa_rtp_send(pa_rtp_context *c, size_t size, pa_memblockq *q) { } skip += k; - pa_memblockq_drop(q, &chunk, k); + pa_memblockq_drop(q, k); } if (r < 0 || !chunk.memblock || n >= size || iov_idx >= MAX_IOVECS) { |