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.

16 files changed, 38 insertions, 38 deletions

diff --git a/player/audio.c b/player/audio.c
index 8be2f9cddc..32f93d869a 100644
--- a/player/audio.c
+++ b/player/audio.c
@@ -26,7 +26,7 @@
 #include "talloc.h"
 
 #include "mpvcore/mp_msg.h"
-#include "mpvcore/options.h"
+#include "options/options.h"
 #include "mpvcore/mp_common.h"
 
 #include "audio/mixer.h"
diff --git a/player/command.c b/player/command.c
index 258251e948..532372e3ca 100644
--- a/player/command.c
+++ b/player/command.c
@@ -42,9 +42,9 @@
 #include "mpvcore/playlist_parser.h"
 #include "sub/osd.h"
 #include "sub/dec_sub.h"
-#include "mpvcore/m_option.h"
-#include "mpvcore/m_property.h"
-#include "mpvcore/m_config.h"
+#include "options/m_option.h"
+#include "options/m_property.h"
+#include "options/m_config.h"
 #include "video/filter/vf.h"
 #include "video/decode/vd.h"
 #include "video/out/vo.h"
@@ -55,7 +55,7 @@
 #include "audio/filter/af.h"
 #include "video/decode/dec_video.h"
 #include "audio/decode/dec_audio.h"
-#include "mpvcore/path.h"
+#include "options/path.h"
 #include "stream/tv.h"
 #include "stream/stream_radio.h"
 #include "stream/pvr.h"
diff --git a/player/configfiles.c b/player/configfiles.c
index eb72de08ed..01b05ec6bc 100644
--- a/player/configfiles.c
+++ b/player/configfiles.c
@@ -32,12 +32,12 @@
 #include "osdep/io.h"
 
 #include "mpvcore/mp_msg.h"
-#include "mpvcore/path.h"
-#include "mpvcore/m_config.h"
-#include "mpvcore/parser-cfg.h"
+#include "options/path.h"
+#include "options/m_config.h"
+#include "options/parse_configfile.h"
 #include "mpvcore/playlist.h"
-#include "mpvcore/options.h"
-#include "mpvcore/m_property.h"
+#include "options/options.h"
+#include "options/m_property.h"
 
 #include "stream/stream.h"
 
diff --git a/player/core.h b/player/core.h
index e1c7997907..551b902f9d 100644
--- a/player/core.h
+++ b/player/core.h
@@ -22,7 +22,7 @@
 #include <stdbool.h>
 
 #include "mpvcore/mp_common.h"
-#include "mpvcore/options.h"
+#include "options/options.h"
 
 // definitions used internally by the core player code
 
diff --git a/player/loadfile.c b/player/loadfile.c
index b1e41a08b8..7132ca972e 100644
--- a/player/loadfile.c
+++ b/player/loadfile.c
@@ -31,12 +31,12 @@
 #include "osdep/timer.h"
 
 #include "mpvcore/mp_msg.h"
-#include "mpvcore/path.h"
-#include "mpvcore/m_config.h"
-#include "mpvcore/parser-cfg.h"
+#include "options/path.h"
+#include "options/m_config.h"
+#include "options/parse_configfile.h"
 #include "mpvcore/playlist.h"
-#include "mpvcore/options.h"
-#include "mpvcore/m_property.h"
+#include "options/options.h"
+#include "options/m_property.h"
 #include "mpvcore/mp_common.h"
 #include "mpvcore/encode.h"
 #include "input/input.h"
diff --git a/player/lua.c b/player/lua.c
index c72e1b7d1b..56a9d74332 100644
--- a/player/lua.c
+++ b/player/lua.c
@@ -8,11 +8,11 @@
 #include "talloc.h"
 
 #include "mpvcore/mp_common.h"
-#include "mpvcore/m_property.h"
+#include "options/m_property.h"
 #include "mpvcore/mp_msg.h"
-#include "mpvcore/m_option.h"
+#include "options/m_option.h"
 #include "input/input.h"
-#include "mpvcore/path.h"
+#include "options/path.h"
 #include "mpvcore/bstr.h"
 #include "osdep/timer.h"
 #include "sub/osd.h"
diff --git a/player/main.c b/player/main.c
index cfaf6f47d5..dfab92eefc 100644
--- a/player/main.c
+++ b/player/main.c
@@ -36,17 +36,17 @@
 #include "mpvcore/codecs.h"
 #include "mpvcore/cpudetect.h"
 #include "mpvcore/encode.h"
-#include "mpvcore/m_config.h"
-#include "mpvcore/m_option.h"
-#include "mpvcore/m_property.h"
+#include "options/m_config.h"
+#include "options/m_option.h"
+#include "options/m_property.h"
 #include "mpvcore/mp_common.h"
 #include "mpvcore/mp_msg.h"
 #include "mpvcore/mpv_global.h"
-#include "mpvcore/parser-cfg.h"
-#include "mpvcore/parser-mpcmd.h"
+#include "options/parse_configfile.h"
+#include "options/parse_commandline.h"
 #include "mpvcore/playlist.h"
 #include "mpvcore/playlist_parser.h"
-#include "mpvcore/options.h"
+#include "options/options.h"
 #include "input/input.h"
 
 #include "audio/decode/dec_audio.h"
diff --git a/player/misc.c b/player/misc.c
index 928b56f88c..f57695dae1 100644
--- a/player/misc.c
+++ b/player/misc.c
@@ -27,8 +27,8 @@
 #include "osdep/timer.h"
 
 #include "mpvcore/mp_msg.h"
-#include "mpvcore/options.h"
-#include "mpvcore/m_property.h"
+#include "options/options.h"
+#include "options/m_property.h"
 #include "mpvcore/mp_common.h"
 #include "mpvcore/encode.h"
 #include "mpvcore/playlist.h"
diff --git a/player/osd.c b/player/osd.c
index f2a81b961b..1ee8c52aa5 100644
--- a/player/osd.c
+++ b/player/osd.c
@@ -27,9 +27,9 @@
 #include "talloc.h"
 
 #include "mpvcore/mp_msg.h"
-#include "mpvcore/options.h"
+#include "options/options.h"
 #include "mpvcore/mp_common.h"
-#include "mpvcore/m_property.h"
+#include "options/m_property.h"
 #include "mpvcore/encode.h"
 
 #include "osdep/getch2.h"
diff --git a/player/playloop.c b/player/playloop.c
index 9bfd2f82a4..cb6b72f710 100644
--- a/player/playloop.c
+++ b/player/playloop.c
@@ -26,10 +26,10 @@
 #include "talloc.h"
 
 #include "mpvcore/mp_msg.h"
-#include "mpvcore/options.h"
+#include "options/options.h"
 #include "mpvcore/mp_common.h"
 #include "mpvcore/encode.h"
-#include "mpvcore/m_property.h"
+#include "options/m_property.h"
 #include "mpvcore/playlist.h"
 #include "input/input.h"
 
diff --git a/player/screenshot.c b/player/screenshot.c
index f501a073b7..fd09474904 100644
--- a/player/screenshot.c
+++ b/player/screenshot.c
@@ -30,7 +30,7 @@
 #include "command.h"
 #include "mpvcore/bstr.h"
 #include "mpvcore/mp_msg.h"
-#include "mpvcore/path.h"
+#include "options/path.h"
 #include "video/mp_image.h"
 #include "video/decode/dec_video.h"
 #include "video/filter/vf.h"
diff --git a/player/sub.c b/player/sub.c
index 6270d3e69d..ea6eaee89a 100644
--- a/player/sub.c
+++ b/player/sub.c
@@ -26,7 +26,7 @@
 #include "talloc.h"
 
 #include "mpvcore/mp_msg.h"
-#include "mpvcore/options.h"
+#include "options/options.h"
 #include "mpvcore/mp_common.h"
 
 #include "stream/stream.h"
diff --git a/player/timeline/tl_cue.c b/player/timeline/tl_cue.c
index 3a6eb379fc..48336ed467 100644
--- a/player/timeline/tl_cue.c
+++ b/player/timeline/tl_cue.c
@@ -27,7 +27,7 @@
 #include "player/core.h"
 #include "mpvcore/mp_msg.h"
 #include "demux/demux.h"
-#include "mpvcore/path.h"
+#include "options/path.h"
 #include "mpvcore/bstr.h"
 #include "mpvcore/mp_common.h"
 #include "stream/stream.h"
diff --git a/player/timeline/tl_matroska.c b/player/timeline/tl_matroska.c
index 85bdf4e57e..4b52ad834f 100644
--- a/player/timeline/tl_matroska.c
+++ b/player/timeline/tl_matroska.c
@@ -33,7 +33,7 @@
 #include "player/core.h"
 #include "mpvcore/mp_msg.h"
 #include "demux/demux.h"
-#include "mpvcore/path.h"
+#include "options/path.h"
 #include "mpvcore/bstr.h"
 #include "mpvcore/mp_common.h"
 #include "mpvcore/playlist.h"
diff --git a/player/timeline/tl_mpv_edl.c b/player/timeline/tl_mpv_edl.c
index aa343a3f47..6a41bcb3c3 100644
--- a/player/timeline/tl_mpv_edl.c
+++ b/player/timeline/tl_mpv_edl.c
@@ -27,7 +27,7 @@
 #include "player/core.h"
 #include "mpvcore/mp_msg.h"
 #include "demux/demux.h"
-#include "mpvcore/path.h"
+#include "options/path.h"
 #include "mpvcore/bstr.h"
 #include "mpvcore/mp_common.h"
 #include "stream/stream.h"
diff --git a/player/video.c b/player/video.c
index e94a0db71b..fd3f4ed658 100644
--- a/player/video.c
+++ b/player/video.c
@@ -26,10 +26,10 @@
 #include "talloc.h"
 
 #include "mpvcore/mp_msg.h"
-#include "mpvcore/options.h"
+#include "options/options.h"
 #include "mpvcore/mp_common.h"
 #include "mpvcore/encode.h"
-#include "mpvcore/m_property.h"
+#include "options/m_property.h"
 
 #include "audio/out/ao.h"
 #include "demux/demux.h"