Make the whole stuff LGPL only

[pulseaudio] / polyp / play-memchunk.c

diff --git a/polyp/play-memchunk.c b/polyp/play-memchunk.c
index 866344070942ecb09c65c7d93a0d5f16c657dab5..1b611db4cdf2a3f238e16d9d165775a21169bffc 100644 (file)
--- a/polyp/play-memchunk.c
+++ b/polyp/play-memchunk.c
@@ -1,5 +1,32 @@
+/* $Id$ */
+
+/***
+  This file is part of polypaudio.
+ 
+  polypaudio 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,
+  or (at your option) any later version.
+ 
+  polypaudio is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  General Public License for more details.
+ 
+  You should have received a copy of the GNU Lesser General Public License
+  along with polypaudio; if not, write to the Free Software
+  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+  USA.
+***/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdlib.h>
 #include <assert.h>
+#include <stdio.h>
+#include <string.h>
 
 #include "play-memchunk.h"
 #include "sink-input.h"
@@ -10,9 +37,12 @@ static void sink_input_kill(struct pa_sink_input *i) {
     assert(i && i->userdata);
     c = i->userdata;
 
+    pa_sink_input_disconnect(i);
+    pa_sink_input_unref(i);
+
     pa_memblock_unref(c->memblock);
     pa_xfree(c);
-    pa_sink_input_free(i);
+    
 }
 
 static int sink_input_peek(struct pa_sink_input *i, struct pa_memchunk *chunk) {
@@ -34,11 +64,12 @@ static void si_kill(struct pa_mainloop_api *m, void *i) {
     sink_input_kill(i);
 }
 
-static void sink_input_drop(struct pa_sink_input *i, size_t length) {
+static void sink_input_drop(struct pa_sink_input *i, const struct pa_memchunk*chunk, size_t length) {
     struct pa_memchunk *c;
     assert(i && length && i->userdata);
     c = i->userdata;
 
+    assert(!memcmp(chunk, c, sizeof(chunk)));
     assert(length <= c->length);
 
     c->length -= length;
@@ -48,7 +79,7 @@ static void sink_input_drop(struct pa_sink_input *i, size_t length) {
         pa_mainloop_api_once(i->sink->core->mainloop, si_kill, i);
 }
 
-int pa_play_memchunk(struct pa_sink *sink, const char *name, const struct pa_sample_spec *ss, const struct pa_memchunk *chunk, uint32_t volume) {
+int pa_play_memchunk(struct pa_sink *sink, const char *name, const struct pa_sample_spec *ss, const struct pa_memchunk *chunk, pa_volume_t volume) {
     struct pa_sink_input *si;
     struct pa_memchunk *nchunk;
 
@@ -57,7 +88,7 @@ int pa_play_memchunk(struct pa_sink *sink, const char *name, const struct pa_sam
     if (volume <= 0)
         return 0;
 
-    if (!(si = pa_sink_input_new(sink, name, ss)))
+    if (!(si = pa_sink_input_new(sink, name, ss, 0, -1)))
         return -1;
 
     si->volume = volume;