screen_queue: no typedef for completion_callback_data_t

[ncmpc.git] / src / lirc.c

diff --git a/src/lirc.c b/src/lirc.c
index 277d70fd2fad2cc02bcedbf7a67cd8b4510833ab..965037bd23f94e8304b85278f4ecbce236b05001 100644 (file)
--- a/src/lirc.c
+++ b/src/lirc.c
@@ -1,5 +1,5 @@
 /* ncmpc (Ncurses MPD Client)
- * (c) 2004-2010 The Music Player Daemon Project
+ * (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
@@ -23,32 +23,11 @@
 
 #include <lirc/lirc_client.h>
 
-static struct lirc_config *lc = NULL;
-
-int ncmpc_lirc_open()
-{
-       char prog[] = "ncmpc";
-       int lirc_socket = 0;
+#include <glib.h>
 
-       if ((lirc_socket = lirc_init(prog, 0)) == -1)
-               return -1;
-
-       if (lirc_readconfig(NULL, &lc, NULL)) {
-               lirc_deinit();
-               return -1;
-       }
-
-       return lirc_socket;
-}
-
-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)
 {
@@ -60,7 +39,7 @@ lirc_event(gcc_unused GIOChannel *source,
        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)
+                       if (!do_input_event(cmd))
                                return FALSE;
                }
        }
@@ -68,3 +47,30 @@ lirc_event(gcc_unused GIOChannel *source,
        end_input_event();
        return TRUE;
 }
+
+void
+ncmpc_lirc_init()
+{
+       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_deinit()
+{
+       if (lc)
+               lirc_freeconfig(lc);
+       lirc_deinit();
+}