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

lirc: drop lirc_in_use, it's made redundant by PA_MODULE_LOAD_ONCE

Browse source
This commit is contained in:
Lennart Poettering 2009-04-13 04:38:57 +02:00
parent d8de5d374e
commit e9dd7a504e
1 changed files with 0 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/modules/module-lirc.c
View file

@ -63,8 +63,6 @@ struct userdata {
float mute_toggle_save; float mute_toggle_save;
}; };
static int lirc_in_use = 0;
static void io_callback(pa_mainloop_api *io, pa_io_event *e, int fd, pa_io_event_flags_t events, void*userdata) { static void io_callback(pa_mainloop_api *io, pa_io_event *e, int fd, pa_io_event_flags_t events, void*userdata) {
struct userdata *u = userdata; struct userdata *u = userdata;
char *name = NULL, *code = NULL; char *name = NULL, *code = NULL;
@ -189,11 +187,6 @@ int pa__init(pa_module*m) {
pa_assert(m); pa_assert(m);
if (lirc_in_use) {
pa_log("module-lirc may no be loaded twice.");
return -1;
}
if (!(ma = pa_modargs_new(m->argument, valid_modargs))) { if (!(ma = pa_modargs_new(m->argument, valid_modargs))) {
pa_log("Failed to parse module arguments"); pa_log("Failed to parse module arguments");
goto fail; goto fail;
@ -219,8 +212,6 @@ int pa__init(pa_module*m) {
u->io = m->core->mainloop->io_new(m->core->mainloop, u->lirc_fd, PA_IO_EVENT_INPUT|PA_IO_EVENT_HANGUP, io_callback, u); u->io = m->core->mainloop->io_new(m->core->mainloop, u->lirc_fd, PA_IO_EVENT_INPUT|PA_IO_EVENT_HANGUP, io_callback, u);
lirc_in_use = 1;
pa_modargs_free(ma); pa_modargs_free(ma);
return 0; return 0;
@ -252,6 +243,4 @@ void pa__done(pa_module*m) {
pa_xfree(u->sink_name); pa_xfree(u->sink_name);
pa_xfree(u); pa_xfree(u);
lirc_in_use = 0;
} }