From 19f2acbd0a9d199b77ad71eaf206319f6f12e323 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 27 Oct 2004 14:42:56 +0000 Subject: add null sink git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@259 fefdeb5f-60dc-0310-8127-8f9354f1896f --- polyp/Makefile.am | 12 +++- polyp/module-null-sink.c | 148 +++++++++++++++++++++++++++++++++++++++++++++++ polyp/module-pipe-sink.c | 6 +- polyp/voltest.c | 2 + 4 files changed, 161 insertions(+), 7 deletions(-) create mode 100644 polyp/module-null-sink.c (limited to 'polyp') diff --git a/polyp/Makefile.am b/polyp/Makefile.am index 10e1c6cb..ae551a1b 100644 --- a/polyp/Makefile.am +++ b/polyp/Makefile.am @@ -33,14 +33,15 @@ AM_LDADD=$(PTHREAD_LIBS) -lm AM_LIBADD=$(PTHREAD_LIBS) -lm EXTRA_DIST = default.pa.in daemon.conf.in client.conf.in depmod.py esdcompat.sh.in -bin_PROGRAMS = polypaudio pacat pactl paplay voltest +bin_PROGRAMS = polypaudio pacat pactl paplay bin_SCRIPTS = esdcompat.sh noinst_PROGRAMS = \ mainloop-test \ pacat-simple \ parec-simple \ cpulimit-test \ - cpulimit-test2 + cpulimit-test2 \ + voltest polypconf_DATA=default.pa daemon.conf client.conf @@ -108,7 +109,8 @@ modlib_LTLIBRARIES= \ module-esound-compat-spawnpid.la \ module-match.la \ module-tunnel-sink.la \ - module-tunnel-source.la + module-tunnel-source.la \ + module-null-sink.la lib_LTLIBRARIES= \ libpolyp-@PA_MAJORMINOR@.la \ @@ -308,6 +310,10 @@ module_combine_la_SOURCES = module-combine.c module_combine_la_LDFLAGS = -module -avoid-version module_combine_la_LIBADD = $(AM_LIBADD) +module_null_sink_la_SOURCES = module-null-sink.c +module_null_sink_la_LDFLAGS = -module -avoid-version +module_null_sink_la_LIBADD = $(AM_LIBADD) + module_match_la_SOURCES = module-match.c module_match_la_LDFLAGS = -module -avoid-version module_match_la_LIBADD = $(AM_LIBADD) diff --git a/polyp/module-null-sink.c b/polyp/module-null-sink.c new file mode 100644 index 00000000..e48e9668 --- /dev/null +++ b/polyp/module-null-sink.c @@ -0,0 +1,148 @@ +/* $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 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 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 +#endif + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "iochannel.h" +#include "sink.h" +#include "module.h" +#include "util.h" +#include "modargs.h" +#include "xmalloc.h" +#include "log.h" + +PA_MODULE_AUTHOR("Lennart Poettering") +PA_MODULE_DESCRIPTION("Clocked NULL sink") +PA_MODULE_VERSION(PACKAGE_VERSION) +PA_MODULE_USAGE("format= channels= rate= sink_name=") + +#define DEFAULT_SINK_NAME "null" + +struct userdata { + struct pa_core *core; + struct pa_module *module; + struct pa_sink *sink; + struct pa_time_event *time_event; + size_t block_size; +}; + +static const char* const valid_modargs[] = { + "rate", + "format", + "channels", + "sink_name", + NULL +}; + +static void time_callback(struct pa_mainloop_api *m, struct pa_time_event*e, const struct timeval *tv, void *userdata) { + struct userdata *u = userdata; + struct pa_memchunk chunk; + struct timeval ntv = *tv; + size_t l; + + assert(u); + + if (pa_sink_render(u->sink, u->block_size, &chunk) >= 0) { + l = chunk.length; + pa_memblock_unref(chunk.memblock); + } else + l = u->block_size; + + pa_timeval_add(&ntv, pa_bytes_to_usec(l, &u->sink->sample_spec)); + m->time_restart(e, &ntv); +} + +int pa__init(struct pa_core *c, struct pa_module*m) { + struct userdata *u = NULL; + struct pa_sample_spec ss; + struct pa_modargs *ma = NULL; + struct timeval tv; + assert(c && m); + + if (!(ma = pa_modargs_new(m->argument, valid_modargs))) { + pa_log(__FILE__": failed to parse module arguments\n"); + goto fail; + } + + ss = c->default_sample_spec; + if (pa_modargs_get_sample_spec(ma, &ss) < 0) { + pa_log(__FILE__": invalid sample format specification\n"); + goto fail; + } + + u = pa_xmalloc0(sizeof(struct userdata)); + u->core = c; + u->module = m; + m->userdata = u; + + if (!(u->sink = pa_sink_new(c, pa_modargs_get_value(ma, "sink_name", DEFAULT_SINK_NAME), 0, &ss))) { + pa_log(__FILE__": failed to create sink.\n"); + goto fail; + } + + u->sink->userdata = u; + pa_sink_set_owner(u->sink, m); + u->sink->description = pa_sprintf_malloc("NULL sink"); + + gettimeofday(&tv, NULL); + u->time_event = c->mainloop->time_new(c->mainloop, &tv, time_callback, u); + + u->block_size = pa_bytes_per_second(&ss) / 10; + + pa_modargs_free(ma); + + return 0; + +fail: + if (ma) + pa_modargs_free(ma); + + pa__done(c, m); + + return -1; +} + +void pa__done(struct pa_core *c, struct pa_module*m) { + struct userdata *u; + assert(c && m); + + if (!(u = m->userdata)) + return; + + pa_sink_disconnect(u->sink); + pa_sink_unref(u->sink); + + u->core->mainloop->time_free(u->time_event); + + pa_xfree(u); +} diff --git a/polyp/module-pipe-sink.c b/polyp/module-pipe-sink.c index c5097fb7..7c779f7d 100644 --- a/polyp/module-pipe-sink.c +++ b/polyp/module-pipe-sink.c @@ -162,9 +162,10 @@ int pa__init(struct pa_core *c, struct pa_module*m) { } u = pa_xmalloc0(sizeof(struct userdata)); - u->filename = pa_xstrdup(p); u->core = c; + u->module = m; + m->userdata = u; if (!(u->sink = pa_sink_new(c, pa_modargs_get_value(ma, "sink_name", DEFAULT_SINK_NAME), 0, &ss))) { pa_log(__FILE__": failed to create sink.\n"); @@ -187,9 +188,6 @@ int pa__init(struct pa_core *c, struct pa_module*m) { assert(u->defer_event); c->mainloop->defer_enable(u->defer_event, 0); - u->module = m; - m->userdata = u; - pa_modargs_free(ma); return 0; diff --git a/polyp/voltest.c b/polyp/voltest.c index a06d4ca2..d8d5c569 100644 --- a/polyp/voltest.c +++ b/polyp/voltest.c @@ -1,3 +1,5 @@ +/* $Id$ */ + #include #include -- cgit