diff --git a/src/lirc.c b/src/lirc.c
index 4e7e423d115055776cc4beb81de8a6d34579b85c..58b2cd7b0138afaf0f7d606d06730b3504394a33 100644 (file)
--- a/src/lirc.c
+++ b/src/lirc.c
-#include <lirc/lirc_client.h>
+/* ncmpc (Ncurses MPD Client)
+ * (c) 2004-2017 The Music Player Daemon Project
+ * Project homepage: http://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.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
#include "lirc.h"
+#include "ncmpc.h"
+#include "Compiler.h"
+
+#include <lirc/lirc_client.h>
+
+#include <glib.h>
static struct lirc_config *lc = NULL;
-static int lirc_socket = 0;
-int ncmpc_lirc_open()
+static gboolean
+lirc_event(gcc_unused GIOChannel *source,
+ gcc_unused GIOCondition condition, gcc_unused gpointer data)
+{
+ char *code, *txt;
+ command_t cmd;
+
+ begin_input_event();
+
+ 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;
+ }
+ }
+
+ end_input_event();
+ return TRUE;
+}
+
+void
+ncmpc_lirc_open()
{
char prog[] = "ncmpc";
+ int lirc_socket = 0;
if ((lirc_socket = lirc_init(prog, 0)) == -1)
- return -1;
+ return;
if (lirc_readconfig(NULL, &lc, NULL)) {
lirc_deinit();
- return -1;
+ return;
}
- return lirc_socket;
+ GIOChannel *channel = g_io_channel_unix_new(lirc_socket);
+ g_io_add_watch(channel, G_IO_IN, lirc_event, NULL);
+ g_io_channel_unref(channel);
}
void ncmpc_lirc_close()
lirc_freeconfig(lc);
lirc_deinit();
}
-
-command_t ncmpc_lirc_get_command()
-{
- char *code = NULL, *cmd = NULL;
-
- if (lirc_nextcode(&code) != 0)
- return CMD_NONE;
-
- if (lirc_code2char(lc, code, &cmd) != 0)
- return CMD_NONE;
-
- if (!cmd)
- return CMD_NONE;
-
- return get_key_command_from_name(cmd);
-}