Merge HUGE set of changes temporarily into a branch, to allow me to move them from...

[pulseaudio] / src / pulsecore / play-memchunk.c

diff --git a/src/pulsecore/play-memchunk.c b/src/pulsecore/play-memchunk.c
index c5dcc8cecc357d79857730c7f6aa4cee049c073a..65b6e825540bbf80099d2122f648d06b5d90b1eb 100644 (file)
--- a/src/pulsecore/play-memchunk.c
+++ b/src/pulsecore/play-memchunk.c
@@ -3,6 +3,8 @@
 /***
   This file is part of PulseAudio.
 
+  Copyright 2004-2006 Lennart Poettering
+
   PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
@@ -55,7 +57,7 @@ static int sink_input_peek(pa_sink_input *i, pa_memchunk *chunk) {
     if (c->length <= 0)
         return -1;
 
-    assert(c->memblock && c->memblock->length);
+    assert(c->memblock);
     *chunk = *c;
     pa_memblock_ref(c->memblock);
 
@@ -120,7 +122,5 @@ int pa_play_memchunk(
 
     pa_memblock_ref(chunk->memblock);
 
-    pa_sink_notify(si->sink);
-
     return 0;
 }