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 /osdep | |
| 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 'osdep')
| -rw-r--r-- | osdep/getch2-win.c | 4 | ||||
| -rw-r--r-- | osdep/getch2.c | 8 | ||||
| -rw-r--r-- | osdep/macosx_application.m | 6 | ||||
| -rw-r--r-- | osdep/macosx_bundle.m | 2 | ||||
| -rw-r--r-- | osdep/macosx_events.h | 2 | ||||
| -rw-r--r-- | osdep/macosx_events.m | 2 | ||||
| -rw-r--r-- | osdep/priority.c | 2 | ||||
| -rw-r--r-- | osdep/timer-darwin.c | 2 |
8 files changed, 14 insertions, 14 deletions
diff --git a/osdep/getch2-win.c b/osdep/getch2-win.c index 558876ff62..c76f0b32cb 100644 --- a/osdep/getch2-win.c +++ b/osdep/getch2-win.c @@ -28,8 +28,8 @@ #include <stdint.h> #include <string.h> #include <windows.h> -#include "core/input/keycodes.h" -#include "core/input/input.h" +#include "mpvcore/input/keycodes.h" +#include "mpvcore/input/input.h" #include "getch2.h" int mp_input_slave_cmd_func(int fd, char *dest, int size) diff --git a/osdep/getch2.c b/osdep/getch2.c index d31bb97ab0..eeefa8c9e6 100644 --- a/osdep/getch2.c +++ b/osdep/getch2.c @@ -46,10 +46,10 @@ #include <unistd.h> -#include "core/mp_common.h" -#include "core/bstr.h" -#include "core/input/input.h" -#include "core/input/keycodes.h" +#include "mpvcore/mp_common.h" +#include "mpvcore/bstr.h" +#include "mpvcore/input/input.h" +#include "mpvcore/input/keycodes.h" #include "getch2.h" #ifdef HAVE_TERMIOS diff --git a/osdep/macosx_application.m b/osdep/macosx_application.m index a2718b1bf9..d04b2ccdea 100644 --- a/osdep/macosx_application.m +++ b/osdep/macosx_application.m @@ -19,9 +19,9 @@ #include <pthread.h> #include "talloc.h" -#include "core/mp_msg.h" -#include "core/input/input.h" -#include "core/input/keycodes.h" +#include "mpvcore/mp_msg.h" +#include "mpvcore/input/input.h" +#include "mpvcore/input/keycodes.h" #include "osdep/macosx_application_objc.h" #include "osdep/macosx_compat.h" diff --git a/osdep/macosx_bundle.m b/osdep/macosx_bundle.m index cef0fc550a..3a1f3b5b0b 100644 --- a/osdep/macosx_bundle.m +++ b/osdep/macosx_bundle.m @@ -18,7 +18,7 @@ #import <Foundation/Foundation.h> #include "osdep/macosx_bundle.h" -#include "core/path.h" +#include "mpvcore/path.h" char *get_bundled_path(const char *file) { diff --git a/osdep/macosx_events.h b/osdep/macosx_events.h index 1adb2e809b..409a210fb8 100644 --- a/osdep/macosx_events.h +++ b/osdep/macosx_events.h @@ -19,7 +19,7 @@ #ifndef MACOSX_EVENTS_H #define MACOSX_EVENTS_H -#include "core/input/keycodes.h" +#include "mpvcore/input/keycodes.h" void cocoa_put_key(int keycode); void cocoa_put_key_with_modifiers(int keycode, int modifiers); diff --git a/osdep/macosx_events.m b/osdep/macosx_events.m index 88a99e798d..fe5376bd9c 100644 --- a/osdep/macosx_events.m +++ b/osdep/macosx_events.m @@ -26,7 +26,7 @@ #import <Cocoa/Cocoa.h> #include "talloc.h" -#include "core/input/input.h" +#include "mpvcore/input/input.h" // doesn't make much sense, but needed to access keymap functionality #include "video/out/vo.h" diff --git a/osdep/priority.c b/osdep/priority.c index 81e9f6689f..76b381c6ef 100644 --- a/osdep/priority.c +++ b/osdep/priority.c @@ -26,7 +26,7 @@ #include <string.h> -#include "core/mp_msg.h" +#include "mpvcore/mp_msg.h" #include "priority.h" diff --git a/osdep/timer-darwin.c b/osdep/timer-darwin.c index e5f751915e..72b96675c7 100644 --- a/osdep/timer-darwin.c +++ b/osdep/timer-darwin.c @@ -24,7 +24,7 @@ #include <mach/mach_time.h> #include "config.h" -#include "core/mp_msg.h" +#include "mpvcore/mp_msg.h" #include "timer.h" static double timebase_ratio; |