diff options
| author | wm4 <wm4@nowhere> | 2012-11-09 01:06:43 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2012-11-12 20:08:18 +0100 |
| commit | 4873b32c5959c988af1769529ff72e3fd62fba82 (patch) | |
| tree | e18fbd7eef54de6071969689aa5c31d6ea1f0963 /core/input | |
| parent | d4bdd0473d6f43132257c9fb3848d829755167a3 (diff) | |
| download | mpv-4873b32c5959c988af1769529ff72e3fd62fba82.tar.bz2 mpv-4873b32c5959c988af1769529ff72e3fd62fba82.tar.xz | |
Rename directories, move files (step 2 of 2)
Finish renaming directories and moving files. Adjust all include
statements to make the previous commit compile.
The two commits are separate, because git is bad at tracking renames
and content changes at the same time.
Also take this as an opportunity to remove the separation between
"common" and "mplayer" sources in the Makefile. ("common" used to be
shared between mplayer and mencoder.)
Diffstat (limited to 'core/input')
| -rw-r--r-- | core/input/appleir.c | 2 | ||||
| -rw-r--r-- | core/input/input.c | 16 | ||||
| -rw-r--r-- | core/input/input.h | 6 | ||||
| -rw-r--r-- | core/input/joystick.c | 2 | ||||
| -rw-r--r-- | core/input/lirc.c | 2 |
5 files changed, 14 insertions, 14 deletions
diff --git a/core/input/appleir.c b/core/input/appleir.c index c64bc9648d..4615f1ef9d 100644 --- a/core/input/appleir.c +++ b/core/input/appleir.c @@ -37,7 +37,7 @@ #include <linux/types.h> #include <linux/input.h> -#include "mp_msg.h" +#include "core/mp_msg.h" // keycodes.h defines would conflict with linux/input.h ones #define AR_DEFINES_ONLY diff --git a/core/input/input.c b/core/input/input.c index 6643747e4d..115d181e69 100644 --- a/core/input/input.c +++ b/core/input/input.c @@ -34,18 +34,18 @@ #include "osdep/io.h" #include "input.h" -#include "mp_fifo.h" +#include "core/mp_fifo.h" #include "keycodes.h" #include "osdep/timer.h" #include "libavutil/avstring.h" #include "libavutil/common.h" -#include "mp_msg.h" -#include "m_config.h" -#include "m_option.h" -#include "path.h" +#include "core/mp_msg.h" +#include "core/m_config.h" +#include "core/m_option.h" +#include "core/path.h" #include "talloc.h" -#include "options.h" -#include "bstr.h" +#include "core/options.h" +#include "core/bstr.h" #include "stream/stream.h" #include "joystick.h" @@ -545,7 +545,7 @@ static 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 "input/input_conf.h" +#include "core/input/input_conf.h" ; // Encode the unicode codepoint as UTF-8, and append to the end of the diff --git a/core/input/input.h b/core/input/input.h index 59f2d031ff..a1c633ad69 100644 --- a/core/input/input.h +++ b/core/input/input.h @@ -20,8 +20,8 @@ #define MPLAYER_INPUT_H #include <stdbool.h> -#include "bstr.h" -#include "m_option.h" +#include "core/bstr.h" +#include "core/m_option.h" // All command IDs enum mp_command_type { @@ -211,7 +211,7 @@ void mp_input_register_options(struct m_config *cfg); // Wake up sleeping input loop from another thread. void mp_input_wakeup(struct input_ctx *ictx); -// Interruptible usleep: (used by libmpdemux) +// Interruptible usleep: (used by demux) int mp_input_check_interrupt(struct input_ctx *ictx, int time); extern int async_quit_request; diff --git a/core/input/joystick.c b/core/input/joystick.c index 673ae92184..ae2bf7990b 100644 --- a/core/input/joystick.c +++ b/core/input/joystick.c @@ -30,7 +30,7 @@ #include <fcntl.h> #include <errno.h> -#include "mp_msg.h" +#include "core/mp_msg.h" #include "keycodes.h" #ifndef JOY_AXIS_DELTA diff --git a/core/input/lirc.c b/core/input/lirc.c index fd64beb479..699168d239 100644 --- a/core/input/lirc.c +++ b/core/input/lirc.c @@ -26,7 +26,7 @@ #include <unistd.h> #include <stdlib.h> -#include "mp_msg.h" +#include "core/mp_msg.h" #include "input.h" #include "lirc.h" |