mirror of
https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git
synced 2025-11-08 13:29:59 -05:00
* 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
This commit is contained in:
parent
e621071bf1
commit
ffa1708070
33 changed files with 532 additions and 444 deletions
|
|
@ -26,10 +26,10 @@
|
|||
#endif
|
||||
|
||||
#include <stdio.h>
|
||||
#include <assert.h>
|
||||
#include <unistd.h>
|
||||
|
||||
#include <pulsecore/module.h>
|
||||
#include <pulsecore/macro.h>
|
||||
#include <pulsecore/iochannel.h>
|
||||
#include <pulsecore/modargs.h>
|
||||
#include <pulsecore/protocol-native.h>
|
||||
|
|
@ -48,25 +48,26 @@ static const char* const valid_modargs[] = {
|
|||
NULL,
|
||||
};
|
||||
|
||||
int pa__init(pa_core *c, pa_module*m) {
|
||||
int pa__init(pa_module*m) {
|
||||
pa_iochannel *io;
|
||||
pa_modargs *ma;
|
||||
int fd, r = -1;
|
||||
assert(c && m);
|
||||
|
||||
pa_assert(m);
|
||||
|
||||
if (!(ma = pa_modargs_new(m->argument, valid_modargs))) {
|
||||
pa_log("failed to parse module arguments.");
|
||||
pa_log("Failed to parse module arguments.");
|
||||
goto finish;
|
||||
}
|
||||
|
||||
if (pa_modargs_get_value_s32(ma, "fd", &fd) < 0) {
|
||||
pa_log("invalid file descriptor.");
|
||||
pa_log("Invalid file descriptor.");
|
||||
goto finish;
|
||||
}
|
||||
|
||||
io = pa_iochannel_new(c->mainloop, fd, fd);
|
||||
io = pa_iochannel_new(m->core->mainloop, fd, fd);
|
||||
|
||||
if (!(m->userdata = pa_protocol_native_new_iochannel(c, io, m, ma))) {
|
||||
if (!(m->userdata = pa_protocol_native_new_iochannel(m->core, io, m, ma))) {
|
||||
pa_iochannel_free(io);
|
||||
goto finish;
|
||||
}
|
||||
|
|
@ -80,8 +81,8 @@ finish:
|
|||
return r;
|
||||
}
|
||||
|
||||
void pa__done(pa_core *c, pa_module*m) {
|
||||
assert(c && m);
|
||||
void pa__done(pa_module*m) {
|
||||
pa_assert(m);
|
||||
|
||||
pa_protocol_native_free(m->userdata);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue