diff options
Diffstat (limited to 'src/lirc.c')
| -rw-r--r-- | src/lirc.c | 28 |
1 files changed, 17 insertions, 11 deletions
diff --git a/src/lirc.c b/src/lirc.c index 4e7e423d1..aeb86650c 100644 --- a/src/lirc.c +++ b/src/lirc.c @@ -1,12 +1,13 @@ #include <lirc/lirc_client.h> #include "lirc.h" +#include "ncmpc.h" static struct lirc_config *lc = NULL; -static int lirc_socket = 0; int ncmpc_lirc_open() { char prog[] = "ncmpc"; + int lirc_socket = 0; if ((lirc_socket = lirc_init(prog, 0)) == -1) return -1; @@ -26,18 +27,23 @@ void ncmpc_lirc_close() lirc_deinit(); } -command_t ncmpc_lirc_get_command() +gboolean +lirc_event(mpd_unused GIOChannel *source, + mpd_unused GIOCondition condition, mpd_unused gpointer data) { - char *code = NULL, *cmd = NULL; + char *code, *txt; + command_t cmd; - if (lirc_nextcode(&code) != 0) - return CMD_NONE; + begin_input_event(); - if (lirc_code2char(lc, code, &cmd) != 0) - return CMD_NONE; - - if (!cmd) - return CMD_NONE; + if (lirc_nextcode(&code) == 0) { + while (lirc_code2char(lc, code, &txt) == 0 && txt != NULL) { + cmd = get_key_command_from_name(txt); + if (do_input_event(cmd) != 0) + return FALSE; + } + } - return get_key_command_from_name(cmd); + end_input_event(); + return TRUE; } |