diff options
| author | Lennart Poettering <lennart@poettering.net> | 2007-08-10 14:28:39 +0000 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2007-08-10 14:28:39 +0000 |
| commit | ffa170807086e959ce7cd9b21fb0c29b104b222b (patch) | |
| tree | f1361aa0b1a54e9545a1de5398cbf1cf17c4b4cb /src/modules/module-pipe-source.c | |
| parent | e621071bf1a4f82ce5eba36917e67048ac0c59ef (diff) | |
* drop redundant pa_core argument from module initialization functions
* make pa__done() implementations optional
* a couple of modernizations
* wrap lt_dlsym() at a single place
* allow passing of an "api" argument to the HAL module, to choose whether OSS devices or ALSA devices should be picked up
* optimize fd closing a little on linux in the forked gconf helper
* save a little memory in the xsmp module
git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/lennart@1615 fefdeb5f-60dc-0310-8127-8f9354f1896f
Diffstat (limited to 'src/modules/module-pipe-source.c')
| -rw-r--r-- | src/modules/module-pipe-source.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/modules/module-pipe-source.c b/src/modules/module-pipe-source.c index a5f95f9a..a8fbcf3d 100644 --- a/src/modules/module-pipe-source.c +++ b/src/modules/module-pipe-source.c @@ -210,7 +210,7 @@ finish: pa_log_debug("Thread shutting down"); } -int pa__init(pa_core *c, pa_module*m) { +int pa__init(pa_module*m) { struct userdata *u; struct stat st; pa_sample_spec ss; @@ -218,7 +218,6 @@ int pa__init(pa_core *c, pa_module*m) { pa_modargs *ma; char *t; - pa_assert(c); pa_assert(m); if (!(ma = pa_modargs_new(m->argument, valid_modargs))) { @@ -226,14 +225,14 @@ int pa__init(pa_core *c, pa_module*m) { goto fail; } - ss = c->default_sample_spec; + ss = m->core->default_sample_spec; if (pa_modargs_get_sample_spec_and_channel_map(ma, &ss, &map, PA_CHANNEL_MAP_DEFAULT) < 0) { pa_log("invalid sample format specification or channel map"); goto fail; } u = pa_xnew0(struct userdata, 1); - u->core = c; + u->core = m->core; u->module = m; m->userdata = u; pa_memchunk_reset(&u->memchunk); @@ -261,7 +260,7 @@ int pa__init(pa_core *c, pa_module*m) { goto fail; } - if (!(u->source = pa_source_new(c, __FILE__, pa_modargs_get_value(ma, "source_name", DEFAULT_SOURCE_NAME), 0, &ss, &map))) { + if (!(u->source = pa_source_new(m->core, __FILE__, pa_modargs_get_value(ma, "source_name", DEFAULT_SOURCE_NAME), 0, &ss, &map))) { pa_log("Failed to create source."); goto fail; } @@ -286,15 +285,14 @@ fail: if (ma) pa_modargs_free(ma); - pa__done(c, m); + pa__done(m); return -1; } -void pa__done(pa_core *c, pa_module*m) { +void pa__done(pa_module*m) { struct userdata *u; - pa_assert(c); pa_assert(m); if (!(u = m->userdata)) |