[pulseaudio-commits] r1161 - in /trunk/src: Makefile.am pulsecore/play-memblockq.c pulsecore/play-memblockq.h
svnmailer-noreply at 0pointer.de
svnmailer-noreply at 0pointer.de
Fri Jul 28 15:52:29 PDT 2006
Author: lennart
Date: Sat Jul 29 00:52:28 2006
New Revision: 1161
URL: http://0pointer.de/cgi-bin/viewcvs.cgi?rev=1161&root=pulseaudio&view=rev
Log:
introduce pa_play_memblockq() which creates a playback stream and passes the data from the memblockq to it. after that is done, frees the memblockq
Added:
trunk/src/pulsecore/play-memblockq.c (with props)
trunk/src/pulsecore/play-memblockq.h (with props)
Modified:
trunk/src/Makefile.am
Modified: trunk/src/Makefile.am
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/Makefile.am?rev=1161&root=pulseaudio&r1=1160&r2=1161&view=diff
==============================================================================
--- trunk/src/Makefile.am (original)
+++ trunk/src/Makefile.am Sat Jul 29 00:52:28 2006
@@ -497,6 +497,7 @@
pulsecore/namereg.h \
pulsecore/pid.h \
pulsecore/play-memchunk.h \
+ pulsecore/play-memblockq.h \
pulsecore/props.h \
pulsecore/queue.h \
pulsecore/random.h \
@@ -558,6 +559,7 @@
pulsecore/pid.c pulsecore/pid.h \
pulsecore/pipe.c pulsecore/pipe.h \
pulsecore/play-memchunk.c pulsecore/play-memchunk.h \
+ pulsecore/play-memblockq.c pulsecore/play-memblockq.h \
pulsecore/poll.c pulsecore/poll.h \
pulsecore/props.c pulsecore/props.h \
pulsecore/queue.c pulsecore/queue.h \
Added: trunk/src/pulsecore/play-memblockq.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/play-memblockq.c?rev=1161&root=pulseaudio&view=auto
==============================================================================
--- trunk/src/pulsecore/play-memblockq.c (added)
+++ trunk/src/pulsecore/play-memblockq.c Sat Jul 29 00:52:28 2006
@@ -1,0 +1,113 @@
+/* $Id$ */
+
+/***
+ This file is part of PulseAudio.
+
+ 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,
+ 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
+ USA.
+***/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#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 "play-memblockq.h"
+
+static void sink_input_kill(pa_sink_input *i) {
+ pa_memblockq *q;
+ assert(i);
+ assert(i->userdata);
+
+ q = i->userdata;
+
+ pa_sink_input_disconnect(i);
+ pa_sink_input_unref(i);
+
+ pa_memblockq_free(q);
+}
+
+static int sink_input_peek(pa_sink_input *i, pa_memchunk *chunk) {
+ pa_memblockq *q;
+ assert(i);
+ assert(chunk);
+ assert(i->userdata);
+
+ q = i->userdata;
+
+ return pa_memblockq_peek(q, chunk);
+}
+
+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_memblockq *q;
+
+ assert(i);
+ assert(length > 0);
+ assert( i->userdata);
+
+ q = i->userdata;
+
+ pa_memblockq_drop(q, chunk, length);
+
+ if (pa_memblockq_get_length(q) <= 0)
+ pa_mainloop_api_once(i->sink->core->mainloop, si_kill, i);
+}
+
+int pa_play_memblockq(
+ pa_sink *sink,
+ const char *name,
+ const pa_sample_spec *ss,
+ const pa_channel_map *map,
+ pa_memblockq *q,
+ pa_cvolume *cvolume) {
+
+ pa_sink_input *si;
+
+ assert(sink);
+ assert(ss);
+ assert(q);
+
+ if (pa_memblockq_get_length(q) <= 0)
+ return 0;
+
+ if (cvolume && pa_cvolume_is_muted(cvolume))
+ return 0;
+
+ if (!(si = pa_sink_input_new(sink, name, __FILE__, ss, map, cvolume, 0, PA_RESAMPLER_INVALID)))
+ return -1;
+
+ si->peek = sink_input_peek;
+ si->drop = sink_input_drop;
+ si->kill = sink_input_kill;
+
+ si->userdata = q;
+
+ pa_sink_notify(sink);
+
+ return 0;
+}
Propchange: trunk/src/pulsecore/play-memblockq.c
------------------------------------------------------------------------------
svn:keywords = Id
Added: trunk/src/pulsecore/play-memblockq.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/play-memblockq.h?rev=1161&root=pulseaudio&view=auto
==============================================================================
--- trunk/src/pulsecore/play-memblockq.h (added)
+++ trunk/src/pulsecore/play-memblockq.h Sat Jul 29 00:52:28 2006
@@ -1,0 +1,36 @@
+#ifndef fooplaymemblockqhfoo
+#define fooplaymemblockqhfoo
+
+/* $Id$ */
+
+/***
+ This file is part of PulseAudio.
+
+ 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,
+ 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
+ USA.
+***/
+
+#include <pulsecore/sink.h>
+#include <pulsecore/memblockq.h>
+
+int pa_play_memblockq(
+ pa_sink *sink,
+ const char *name,
+ const pa_sample_spec *ss,
+ const pa_channel_map *map,
+ pa_memblockq *q,
+ pa_cvolume *cvolume);
+
+#endif
Propchange: trunk/src/pulsecore/play-memblockq.h
------------------------------------------------------------------------------
svn:keywords = Id
More information about the pulseaudio-commits
mailing list