release v0.29

[ncmpc.git] / src / lirc.c

diff --git a/src/lirc.c b/src/lirc.c
index fb54c3801c5dddfa30236b521cbeb68410aa8302..965037bd23f94e8304b85278f4ecbce236b05001 100644 (file)
--- a/src/lirc.c
+++ b/src/lirc.c
@@ -1,6 +1,6 @@
-/*
- * (c) 2004-2008 The Music Player Daemon Project
- * http://www.musicpd.org/
+/* 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
@@ -11,44 +11,25 @@
  * 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
  *
+ * 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/lirc_client.h>
 #include "lirc.h"
 #include "ncmpc.h"
+#include "Compiler.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;
-       }
+#include <lirc/lirc_client.h>
 
-       return lirc_socket;
-}
+#include <glib.h>
 
-void ncmpc_lirc_close()
-{
-       if (lc)
-               lirc_freeconfig(lc);
-       lirc_deinit();
-}
+static struct lirc_config *lc = NULL;
 
-gboolean
-lirc_event(G_GNUC_UNUSED GIOChannel *source,
-          G_GNUC_UNUSED GIOCondition condition, G_GNUC_UNUSED gpointer data)
+static gboolean
+lirc_event(gcc_unused GIOChannel *source,
+          gcc_unused GIOCondition condition, gcc_unused gpointer data)
 {
        char *code, *txt;
        command_t cmd;
@@ -58,7 +39,7 @@ lirc_event(G_GNUC_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;
                }
        }
@@ -66,3 +47,30 @@ lirc_event(G_GNUC_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();
+}