diff options
| author | Lennart Poettering <lennart@poettering.net> | 2009-04-13 04:38:57 +0200 | 
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2009-04-13 04:38:57 +0200 | 
| commit | e9dd7a504e5495de864446ee0c4c344e10c67a41 (patch) | |
| tree | d344b4d4915799ac64130d8d32a0daad1c6a0844 /src | |
| parent | d8de5d374e0a5f438eeaa2b6c1e0771801736502 (diff) | |
lirc: drop lirc_in_use, it's made redundant by PA_MODULE_LOAD_ONCE
Diffstat (limited to 'src')
| -rw-r--r-- | src/modules/module-lirc.c | 11 | 
1 files changed, 0 insertions, 11 deletions
diff --git a/src/modules/module-lirc.c b/src/modules/module-lirc.c index bdb8bb71..d1ee2624 100644 --- a/src/modules/module-lirc.c +++ b/src/modules/module-lirc.c @@ -63,8 +63,6 @@ struct userdata {      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) {      struct userdata *u = userdata;      char *name = NULL, *code = NULL; @@ -189,11 +187,6 @@ int pa__init(pa_module*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))) {          pa_log("Failed to parse module arguments");          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); -    lirc_in_use = 1; -      pa_modargs_free(ma);      return 0; @@ -252,6 +243,4 @@ void pa__done(pa_module*m) {      pa_xfree(u->sink_name);      pa_xfree(u); - -    lirc_in_use = 0;  }  | 
