-/* $Id$ */
-
/***
This file is part of PulseAudio.
-
+
+ Copyright 2004-2008 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,
+ by the Free Software Foundation; either version 2.1 of the License,
or (at your option) any later version.
-
+
PulseAudio 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 PulseAudio; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
#endif
#include <stdlib.h>
-#include <assert.h>
#include <stdio.h>
-#include <string.h>
-
-#include <pulse/xmalloc.h>
#include <pulsecore/sink-input.h>
-#include <pulsecore/gccmacro.h>
+#include <pulsecore/play-memblockq.h>
#include "play-memchunk.h"
-static void sink_input_kill(pa_sink_input *i) {
- pa_memchunk *c;
- 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);
-}
-
-static int sink_input_peek(pa_sink_input *i, pa_memchunk *chunk) {
- pa_memchunk *c;
- assert(i && chunk && i->userdata);
- c = i->userdata;
-
- if (c->length <= 0)
- return -1;
-
- assert(c->memblock);
- *chunk = *c;
- pa_memblock_ref(c->memblock);
-
- return 0;
-}
-
-static void si_kill(PA_GCC_UNUSED pa_mainloop_api *m, void *i) {
- sink_input_kill(i);
-}
-
-static void sink_input_drop(pa_sink_input *i, const pa_memchunk*chunk, size_t length) {
- pa_memchunk *c;
- assert(i && length && i->userdata);
- c = i->userdata;
-
- assert(!memcmp(chunk, c, sizeof(chunk)));
- assert(length <= c->length);
-
- c->length -= length;
- c->index += length;
-
- if (c->length <= 0)
- pa_mainloop_api_once(i->sink->core->mainloop, si_kill, i);
-}
-
int pa_play_memchunk(
pa_sink *sink,
- const char *name,
const pa_sample_spec *ss,
const pa_channel_map *map,
const pa_memchunk *chunk,
- pa_cvolume *volume) {
-
- pa_sink_input *si;
- pa_memchunk *nchunk;
- pa_sink_input_new_data data;
+ pa_cvolume *volume,
+ pa_proplist *p,
+ pa_sink_input_flags_t flags,
+ uint32_t *sink_input_index) {
+
+ pa_memblockq *q;
+ int r;
+ pa_memchunk silence;
- assert(sink);
- assert(ss);
- assert(chunk);
+ pa_assert(sink);
+ pa_assert(ss);
+ pa_assert(chunk);
- if (volume && pa_cvolume_is_muted(volume))
- return 0;
+ pa_silence_memchunk_get(&sink->core->silence_cache, sink->core->mempool, &silence, ss, 0);
+ q = pa_memblockq_new("pa_play_memchunk() q", 0, chunk->length, 0, ss, 1, 1, 0, &silence);
+ pa_memblock_unref(silence.memblock);
- pa_sink_input_new_data_init(&data);
- data.sink = sink;
- data.name = name;
- data.driver = __FILE__;
- pa_sink_input_new_data_set_sample_spec(&data, ss);
- pa_sink_input_new_data_set_channel_map(&data, map);
- pa_sink_input_new_data_set_volume(&data, volume);
-
- if (!(si = pa_sink_input_new(sink->core, &data, 0)))
- return -1;
+ pa_assert_se(pa_memblockq_push(q, chunk) >= 0);
- si->peek = sink_input_peek;
- si->drop = sink_input_drop;
- si->kill = sink_input_kill;
-
- si->userdata = nchunk = pa_xnew(pa_memchunk, 1);
- *nchunk = *chunk;
-
- pa_memblock_ref(chunk->memblock);
+ if ((r = pa_play_memblockq(sink, ss, map, q, volume, p, flags, sink_input_index)) < 0) {
+ pa_memblockq_free(q);
+ return r;
+ }
- pa_sink_notify(si->sink);
-
return 0;
}