diff options
author | wm4 <wm4@nowhere> | 2013-12-17 02:39:45 +0100 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2013-12-17 02:39:45 +0100 |
commit | 0112143fdaae0a6264d9e02355e9dc0ca4f7741c (patch) | |
tree | bbbe9527d1e1490e37b67d97398c5bc19c7794cd /input | |
parent | 73a5417950a2d21a397597c05521725f3d125993 (diff) | |
download | mpv-0112143fdaae0a6264d9e02355e9dc0ca4f7741c.tar.bz2 mpv-0112143fdaae0a6264d9e02355e9dc0ca4f7741c.tar.xz |
Split mpvcore/ into common/, misc/, bstr/
Diffstat (limited to 'input')
-rw-r--r-- | input/input.c | 8 | ||||
-rw-r--r-- | input/input.h | 2 | ||||
-rw-r--r-- | input/joystick.c | 2 | ||||
-rw-r--r-- | input/lirc.c | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/input/input.c b/input/input.c index 4d2c873211..16f3b3c71a 100644 --- a/input/input.c +++ b/input/input.c @@ -41,15 +41,15 @@ #include "input.h" #include "keycodes.h" #include "osdep/timer.h" -#include "mpvcore/mp_msg.h" -#include "mpvcore/mpv_global.h" +#include "common/msg.h" +#include "common/global.h" #include "options/m_option.h" #include "options/path.h" #include "talloc.h" #include "options/options.h" -#include "mpvcore/bstr.h" +#include "bstr/bstr.h" #include "stream/stream.h" -#include "mpvcore/mp_common.h" +#include "common/common.h" #include "joystick.h" diff --git a/input/input.h b/input/input.h index 43c5742cf6..4020c3d276 100644 --- a/input/input.h +++ b/input/input.h @@ -20,7 +20,7 @@ #define MPLAYER_INPUT_H #include <stdbool.h> -#include "mpvcore/bstr.h" +#include "bstr/bstr.h" #include "options/m_option.h" // All command IDs diff --git a/input/joystick.c b/input/joystick.c index d8e9d13423..f2be6c3f93 100644 --- a/input/joystick.c +++ b/input/joystick.c @@ -30,7 +30,7 @@ #include <fcntl.h> #include <errno.h> -#include "mpvcore/mp_msg.h" +#include "common/msg.h" #include "keycodes.h" #ifndef JOY_AXIS_DELTA diff --git a/input/lirc.c b/input/lirc.c index 052fffbd74..f3b63468e0 100644 --- a/input/lirc.c +++ b/input/lirc.c @@ -26,7 +26,7 @@ #include <unistd.h> #include <stdlib.h> -#include "mpvcore/mp_msg.h" +#include "common/msg.h" #include "input.h" #include "lirc.h" |