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

1 files changed, 4 insertions, 3 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);