diff options
author | wm4 <wm4@nowhere> | 2014-09-10 00:51:36 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2014-09-10 00:51:36 +0200 |
commit | ae63702a2c5bad0e943b84d05a4c6559052d11e7 (patch) | |
tree | ba197cfcfe7803d37296bcb8aece7a52b8aa077e /input | |
parent | e2a093df02c0340ab285d3905425fd12b376fdef (diff) | |
download | mpv-ae63702a2c5bad0e943b84d05a4c6559052d11e7.tar.bz2 mpv-ae63702a2c5bad0e943b84d05a4c6559052d11e7.tar.xz |
input: remove useless joystick.h/lirc.h include files
These really just waste space.
Diffstat (limited to 'input')
-rw-r--r-- | input/input.c | 14 | ||||
-rw-r--r-- | input/input.h | 2 | ||||
-rw-r--r-- | input/joystick.c | 3 | ||||
-rw-r--r-- | input/joystick.h | 26 | ||||
-rw-r--r-- | input/lirc.c | 3 | ||||
-rw-r--r-- | input/lirc.h | 25 |
6 files changed, 6 insertions, 67 deletions
diff --git a/input/input.c b/input/input.c index 83a76bb51b..cc4cc6285c 100644 --- a/input/input.c +++ b/input/input.c @@ -53,12 +53,6 @@ #include "stream/stream.h" #include "common/common.h" -#include "joystick.h" - -#if HAVE_LIRC -#include "lirc.h" -#endif - #if HAVE_COCOA #include "osdep/macosx_events.h" #endif @@ -230,13 +224,13 @@ const struct m_sub_options input_config = { OPT_FLAG("right-alt-gr", use_alt_gr, CONF_GLOBAL), OPT_INTRANGE("key-fifo-size", key_fifo_size, CONF_GLOBAL, 2, 65000), OPT_FLAG("cursor", enable_mouse_movements, CONF_GLOBAL), - #if HAVE_LIRC +#if HAVE_LIRC OPT_STRING("lirc-conf", lirc_configfile, CONF_GLOBAL), - #endif - #if HAVE_COCOA +#endif +#if HAVE_COCOA OPT_FLAG("appleremote", use_appleremote, CONF_GLOBAL), OPT_FLAG("media-keys", use_media_keys, CONF_GLOBAL), - #endif +#endif {0} }, .size = sizeof(struct input_opts), diff --git a/input/input.h b/input/input.h index f3a10d2ffd..ff3740e21b 100644 --- a/input/input.h +++ b/input/input.h @@ -275,6 +275,8 @@ void mp_input_run_cmd(struct input_ctx *ictx, int def_flags, const char **cmd, const char *location); void mp_input_add_pipe(struct input_ctx *ictx, const char *filename); +void mp_input_joystick_add(struct input_ctx *ictx, char *dev); +void mp_input_lirc_add(struct input_ctx *ictx, char *lirc_configfile); void mp_input_set_main_thread(struct input_ctx *ictx); diff --git a/input/joystick.c b/input/joystick.c index 56eb87f310..ba71da8b52 100644 --- a/input/joystick.c +++ b/input/joystick.c @@ -16,9 +16,6 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "config.h" - -#include "joystick.h" #include "input.h" #include <stdlib.h> diff --git a/input/joystick.h b/input/joystick.h deleted file mode 100644 index 0784ce6128..0000000000 --- a/input/joystick.h +++ /dev/null @@ -1,26 +0,0 @@ -/* - * This file is part of MPlayer. - * - * MPlayer 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. - * - * MPlayer 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 MPlayer; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#ifndef MPLAYER_JOYSTICK_H -#define MPLAYER_JOYSTICK_H - -struct input_ctx; -struct mp_log; -void mp_input_joystick_add(struct input_ctx *ictx, char *dev); - -#endif /* MPLAYER_JOYSTICK_H */ diff --git a/input/lirc.c b/input/lirc.c index 3e03ca843a..ce3b979149 100644 --- a/input/lirc.c +++ b/input/lirc.c @@ -16,8 +16,6 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "config.h" - #include <lirc/lirc_client.h> #include <errno.h> #include <fcntl.h> @@ -29,7 +27,6 @@ #include "common/msg.h" #include "input.h" -#include "lirc.h" struct ctx { struct mp_log *log; diff --git a/input/lirc.h b/input/lirc.h deleted file mode 100644 index b86b40e494..0000000000 --- a/input/lirc.h +++ /dev/null @@ -1,25 +0,0 @@ -/* - * This file is part of MPlayer. - * - * MPlayer 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. - * - * MPlayer 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 MPlayer; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#ifndef MPLAYER_LIRC_H -#define MPLAYER_LIRC_H - -struct input_ctx; -void mp_input_lirc_add(struct input_ctx *ictx, char *lirc_configfile); - -#endif /* MPLAYER_LIRC_H */ |