diff --git a/src/lirc.c b/src/lirc.c
index 86447408276a9f68be6f3145d3f6dfc3912a3ad3..58b2cd7b0138afaf0f7d606d06730b3504394a33 100644 (file)
--- a/src/lirc.c
+++ b/src/lirc.c
#include <lirc/lirc_client.h>
-static struct lirc_config *lc = NULL;
-
-int ncmpc_lirc_open()
-{
- char prog[] = "ncmpc";
- int lirc_socket = 0;
-
- if ((lirc_socket = lirc_init(prog, 0)) == -1)
- return -1;
-
- if (lirc_readconfig(NULL, &lc, NULL)) {
- lirc_deinit();
- return -1;
- }
-
- return lirc_socket;
-}
+#include <glib.h>
-void ncmpc_lirc_close()
-{
- if (lc)
- lirc_freeconfig(lc);
- lirc_deinit();
-}
+static struct lirc_config *lc = NULL;
-gboolean
+static gboolean
lirc_event(gcc_unused GIOChannel *source,
gcc_unused GIOCondition condition, gcc_unused gpointer data)
{
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;
+
+ if (lirc_readconfig(NULL, &lc, NULL)) {
+ lirc_deinit();
+ return;
+ }
+
+ 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()
+{
+ if (lc)
+ lirc_freeconfig(lc);
+ lirc_deinit();
+}