summaryrefslogtreecommitdiffstats
path: root/input
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-12-17 02:02:25 +0100
committerwm4 <wm4@nowhere>2013-12-17 02:07:57 +0100
commiteb15151705d47d23da844449126cc6b4879f110e (patch)
tree661866ee9e73bc893c7963660aae01db503e99aa /input
parent793f85945fc07db905e54390c065ae51b9eeef9b (diff)
downloadmpv-eb15151705d47d23da844449126cc6b4879f110e.tar.bz2
mpv-eb15151705d47d23da844449126cc6b4879f110e.tar.xz
Move options/config related files from mpvcore/ to options/
Since m_option.h and options.h are extremely often included, a lot of files have to be changed. Moving path.c/h to options/ is a bit questionable, but since this is mainly about access to config files (which are also handled in options/), it's probably ok.
Diffstat (limited to 'input')
-rw-r--r--input/input.c7
-rw-r--r--input/input.h2
2 files changed, 4 insertions, 5 deletions
diff --git a/input/input.c b/input/input.c
index c7b27240c7..4d2c873211 100644
--- a/input/input.c
+++ b/input/input.c
@@ -43,11 +43,10 @@
#include "osdep/timer.h"
#include "mpvcore/mp_msg.h"
#include "mpvcore/mpv_global.h"
-#include "mpvcore/m_config.h"
-#include "mpvcore/m_option.h"
-#include "mpvcore/path.h"
+#include "options/m_option.h"
+#include "options/path.h"
#include "talloc.h"
-#include "mpvcore/options.h"
+#include "options/options.h"
#include "mpvcore/bstr.h"
#include "stream/stream.h"
#include "mpvcore/mp_common.h"
diff --git a/input/input.h b/input/input.h
index 1698c9cf9f..43c5742cf6 100644
--- a/input/input.h
+++ b/input/input.h
@@ -21,7 +21,7 @@
#include <stdbool.h>
#include "mpvcore/bstr.h"
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
// All command IDs
enum mp_command_type {