mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-12-15 08:56:34 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

introduce pa_xmalloc() and friends

Browse source 
implement module auto loading


git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@103 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Lennart Poettering 2004-08-04 16:39:30 +00:00
parent 24291aff27
commit 46091a9237
61 changed files with 700 additions and 631 deletions
Download patch file Download diff file Expand all files Collapse all files

27
polyp/module-oss.c
View file

@ -43,6 +43,7 @@
#include "sample-util.h"
#include "util.h"
#include "modargs.h"
#include "xmalloc.h"
struct userdata {
struct pa_sink *sink;
@ -55,6 +56,7 @@ struct userdata {
uint32_t in_fragment_size, out_fragment_size, sample_size;
int fd;
struct pa_module *module;
};
static const char* const valid_modargs[] = {
@ -75,6 +77,13 @@ static const char* const valid_modargs[] = {
#define DEFAULT_SOURCE_NAME "oss_input"
#define DEFAULT_DEVICE "/dev/dsp"
static void update_usage(struct userdata *u) {
pa_module_set_used(u->module,
(u->sink ? pa_idxset_ncontents(u->sink->inputs) : 0) +
(u->sink ? pa_idxset_ncontents(u->sink->monitor_source->outputs) : 0) +
(u->source ? pa_idxset_ncontents(u->source->outputs) : 0));
}
static void do_write(struct userdata *u) {
struct pa_memchunk *memchunk;
ssize_t r;
@ -83,6 +92,8 @@ static void do_write(struct userdata *u) {
if (!u->sink || !pa_iochannel_is_writable(u->io))
return;
update_usage(u);
if (!u->memchunk.length) {
if (pa_sink_render(u->sink, u->out_fragment_size, &u->memchunk) < 0)
memchunk = &u->silence;
@ -118,6 +129,8 @@ static void do_read(struct userdata *u) {
if (!u->source || !pa_iochannel_is_readable(u->io))
return;
update_usage(u);
memchunk.memblock = pa_memblock_new(u->in_fragment_size);
assert(memchunk.memblock);
if ((r = pa_iochannel_read(u->io, memchunk.memblock->data, memchunk.memblock->length)) < 0) {
@ -225,9 +238,7 @@ int pa_module_init(struct pa_core *c, struct pa_module*m) {
out_frag_size = info.fragsize;
}
u = malloc(sizeof(struct userdata));
assert(u);
u = pa_xmalloc(sizeof(struct userdata));
u->core = c;
if (mode != O_WRONLY) {
@ -266,7 +277,8 @@ int pa_module_init(struct pa_core *c, struct pa_module*m) {
assert(u->silence.memblock);
pa_silence_memblock(u->silence.memblock, &ss);
u->silence.index = 0;
u->module = m;
m->userdata = u;
pa_modargs_free(ma);
@ -287,8 +299,8 @@ void pa_module_done(struct pa_core *c, struct pa_module*m) {
struct userdata *u;
assert(c && m);
u = m->userdata;
assert(u);
if (!(u = m->userdata))
return;
if (u->memchunk.memblock)
pa_memblock_unref(u->memchunk.memblock);
@ -299,6 +311,7 @@ void pa_module_done(struct pa_core *c, struct pa_module*m) {
pa_sink_free(u->sink);
if (u->source)
pa_source_free(u->source);
pa_iochannel_free(u->io);
free(u);
pa_xfree(u);
}