diff options
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | src/Makefile.am | 5 | ||||
| -rw-r--r-- | src/lirc.c | 41 | ||||
| -rw-r--r-- | src/lirc.h | 10 | ||||
| -rw-r--r-- | src/main.c | 57 |
5 files changed, 118 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 8611c0da4..d46045fc5 100644 --- a/configure.ac +++ b/configure.ac @@ -174,6 +174,11 @@ if test "x$use_colors" = "xyes" ; then AC_DEFINE([ENABLE_COLORS], [1], [Enable color support]) fi +dnl test for LIRC support +AC_CHECK_LIB(lirc_client, lirc_init) +AC_SUBST(LIRC_LIBS) +AC_DEFINE([ENABLE_LIRC], [1], [Enable LIRC support]) + dnl Debugging AC_MSG_CHECKING([whether to build with debug support]) AC_ARG_ENABLE([debug], diff --git a/src/Makefile.am b/src/Makefile.am index 68af70ddd..57d1eb605 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -37,6 +37,7 @@ ncmpc_headers = \ screen_browser.h \ lyrics.h \ str_pool.h \ + lirc.h \ gcc.h # $Id$ @@ -89,6 +90,10 @@ if ENABLE_LYRICS_SCREEN ncmpc_SOURCES += screen_lyrics.c lyrics.c endif +if ENABLE_LIRC +ncmpc_SOURCES += lirc.c +endif + ncmpc_SOURCES+=${ncmpc_headers} diff --git a/src/lirc.c b/src/lirc.c new file mode 100644 index 000000000..0ad34ca2f --- /dev/null +++ b/src/lirc.c @@ -0,0 +1,41 @@ +#include <lirc/lirc_client.h> +#include "lirc.h" + +static struct lirc_config *lc = NULL; +static int lirc_socket = 0; + +int ncmpc_lirc_open() +{ + if ((lirc_socket = lirc_init("ncmpc", 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(); +} + +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); +} diff --git a/src/lirc.h b/src/lirc.h new file mode 100644 index 000000000..9359898ad --- /dev/null +++ b/src/lirc.h @@ -0,0 +1,10 @@ +#ifndef LIRC_H +#define LIRC_H + +#include "command.h" + +int ncmpc_lirc_open(void); +void ncmpc_lirc_close(void); +command_t ncmpc_lirc_get_command(void); + +#endif diff --git a/src/main.c b/src/main.c index 5f55c490d..49c813a7a 100644 --- a/src/main.c +++ b/src/main.c @@ -34,6 +34,10 @@ #include "lyrics.h" #endif +#ifdef ENABLE_LIRC +#include "lirc.h" +#endif + #include <stdlib.h> #include <unistd.h> #include <signal.h> @@ -292,6 +296,40 @@ keyboard_event(mpd_unused GIOChannel *source, return TRUE; } +#ifdef ENABLE_LIRC +static gboolean +lirc_event(mpd_unused GIOChannel *source, + mpd_unused GIOCondition condition, mpd_unused gpointer data) +{ + command_t cmd; + + /* remove the idle timeout; add it later with fresh interval */ + g_source_remove(idle_source_id); + + if ((cmd = ncmpc_lirc_get_command()) != CMD_NONE) { + if (cmd == CMD_QUIT) { + g_main_loop_quit(main_loop); + return FALSE; + } + + screen_cmd(mpd, cmd); + + if (cmd == CMD_VOLUME_UP || cmd == CMD_VOLUME_DOWN) { + /* make sure we dont update the volume yet */ + g_source_remove(update_source_id); + update_source_id = g_timeout_add(update_interval, + timer_mpd_update, + GINT_TO_POINTER(TRUE)); + } + } + + screen_update(mpd); + + idle_source_id = g_timeout_add(idle_interval, timer_idle, NULL); + return TRUE; +} +#endif + /** * Check the configured key bindings for errors, and display a status * message every 10 seconds. @@ -321,6 +359,10 @@ main(int argc, const char *argv[]) const char *charset = NULL; #endif GIOChannel *keyboard_channel; +#ifdef ENABLE_LIRC + int lirc_socket; + GIOChannel *lirc_channel = NULL; +#endif #ifdef HAVE_LOCALE_H /* time and date formatting */ @@ -426,6 +468,15 @@ main(int argc, const char *argv[]) keyboard_channel = g_io_channel_unix_new(STDIN_FILENO); g_io_add_watch(keyboard_channel, G_IO_IN, keyboard_event, NULL); +#ifdef ENABLE_LIRC + /* watch out for lirc input */ + lirc_socket = ncmpc_lirc_open(); + if (lirc_socket >= 0) { + lirc_channel = g_io_channel_unix_new(lirc_socket); + g_io_add_watch(lirc_channel, G_IO_IN, lirc_event, NULL); + } +#endif + /* attempt to connect */ reconnect_source_id = g_timeout_add(1, timer_reconnect, NULL); @@ -444,6 +495,12 @@ main(int argc, const char *argv[]) g_main_loop_unref(main_loop); g_io_channel_unref(keyboard_channel); +#ifdef ENABLE_LIRC + if (lirc_socket >= 0) + g_io_channel_unref(lirc_channel); + ncmpc_lirc_close(); +#endif + exit_and_cleanup(); ncu_deinit(); |