diff options
| author | Stefano Pigozzi <stefano.pigozzi@gmail.com> | 2013-08-06 22:41:30 +0200 |
|---|---|---|
| committer | Stefano Pigozzi <stefano.pigozzi@gmail.com> | 2013-08-06 22:52:31 +0200 |
| commit | 406241005e3d897b30a5b168a16ad61f0996c43c (patch) | |
| tree | 7884ce5d2d4f5aaa253ffd82e567d13bdd2860af /mpvcore/input | |
| parent | bc27f946c27e33933a3a696cade78a04902c8dce (diff) | |
| download | mpv-406241005e3d897b30a5b168a16ad61f0996c43c.tar.bz2 mpv-406241005e3d897b30a5b168a16ad61f0996c43c.tar.xz | |
core: move contents to mpvcore (2/2)
Followup commit. Fixes all the files references.
Diffstat (limited to 'mpvcore/input')
| -rw-r--r-- | mpvcore/input/input.c | 16 | ||||
| -rw-r--r-- | mpvcore/input/input.h | 4 | ||||
| -rw-r--r-- | mpvcore/input/joystick.c | 2 | ||||
| -rw-r--r-- | mpvcore/input/lirc.c | 2 |
4 files changed, 12 insertions, 12 deletions
diff --git a/mpvcore/input/input.c b/mpvcore/input/input.c index ae1358a76d..935ed62f8e 100644 --- a/mpvcore/input/input.c +++ b/mpvcore/input/input.c @@ -40,15 +40,15 @@ #include "input.h" #include "keycodes.h" #include "osdep/timer.h" -#include "core/mp_msg.h" -#include "core/m_config.h" -#include "core/m_option.h" -#include "core/path.h" +#include "mpvcore/mp_msg.h" +#include "mpvcore/m_config.h" +#include "mpvcore/m_option.h" +#include "mpvcore/path.h" #include "talloc.h" -#include "core/options.h" -#include "core/bstr.h" +#include "mpvcore/options.h" +#include "mpvcore/bstr.h" #include "stream/stream.h" -#include "core/mp_common.h" +#include "mpvcore/mp_common.h" #include "joystick.h" @@ -592,7 +592,7 @@ const m_option_t mp_input_opts[] = { static int default_cmd_func(int fd, char *buf, int l); static const char builtin_input_conf[] = -#include "core/input/input_conf.h" +#include "mpvcore/input/input_conf.h" ; static bool test_rect(struct mp_rect *rc, int x, int y) diff --git a/mpvcore/input/input.h b/mpvcore/input/input.h index 92e2a32c4f..2c8441c7c0 100644 --- a/mpvcore/input/input.h +++ b/mpvcore/input/input.h @@ -20,8 +20,8 @@ #define MPLAYER_INPUT_H #include <stdbool.h> -#include "core/bstr.h" -#include "core/m_option.h" +#include "mpvcore/bstr.h" +#include "mpvcore/m_option.h" // All command IDs enum mp_command_type { diff --git a/mpvcore/input/joystick.c b/mpvcore/input/joystick.c index e8330ffaeb..2ab38f6311 100644 --- a/mpvcore/input/joystick.c +++ b/mpvcore/input/joystick.c @@ -30,7 +30,7 @@ #include <fcntl.h> #include <errno.h> -#include "core/mp_msg.h" +#include "mpvcore/mp_msg.h" #include "keycodes.h" #ifndef JOY_AXIS_DELTA diff --git a/mpvcore/input/lirc.c b/mpvcore/input/lirc.c index 699168d239..059d548f95 100644 --- a/mpvcore/input/lirc.c +++ b/mpvcore/input/lirc.c @@ -26,7 +26,7 @@ #include <unistd.h> #include <stdlib.h> -#include "core/mp_msg.h" +#include "mpvcore/mp_msg.h" #include "input.h" #include "lirc.h" |