diff --git a/src/lirc.c b/src/lirc.c
index 4e7e423d115055776cc4beb81de8a6d34579b85c..fb54c3801c5dddfa30236b521cbeb68410aa8302 100644 (file)
--- a/src/lirc.c
+++ b/src/lirc.c
+/*
+ * (c) 2004-2008 The Music Player Daemon Project
+ * http://www.musicpd.org/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
+
#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;
lirc_deinit();
}
-command_t ncmpc_lirc_get_command()
+gboolean
+lirc_event(G_GNUC_UNUSED GIOChannel *source,
+ G_GNUC_UNUSED GIOCondition condition, G_GNUC_UNUSED gpointer data)
{
- char *code = NULL, *cmd = NULL;
-
- if (lirc_nextcode(&code) != 0)
- return CMD_NONE;
+ char *code, *txt;
+ command_t cmd;
- if (lirc_code2char(lc, code, &cmd) != 0)
- return CMD_NONE;
+ begin_input_event();
- 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;
}