core: move contents to mpvcore (2/2)

Followup commit. Fixes all the files references.

.gitignore

@@ -10,7 +10,7 @@
 /mpv
 /mpv.app
 /version.h
-/core/input/input_conf.h
+/mpvcore/input/input_conf.h
 /tags
 /TAGS
 /video/out/gl_video_shaders.h

DOCS/tech-overview.txt

@@ -2,7 +2,7 @@ NOTE: DOCS/OUTDATED-tech/* may contain more detailed information, but most of it
       is possibly or definitely outdated. This file intends to give a big
       picture of how mpv is structured.
 
-core/mplayer.c:
+mpvcore/mplayer.c:
     This contains the main play loop, anything related to mpv and playback
     related initializations. It also contains the main function. Generally, it
     accesses all other subsystems, initializes them, and pushes data between
@@ -76,7 +76,7 @@ talloc.h & talloc.c:
           replacement. It works on top of system malloc and provides additional
           features that are supposed to make memory management easier.
 
-core/mp_core.h:
+mpvcore/mp_core.h:
     Data structures for mplayer.c and command.c. They are usually not accessed
     by other parts of mpv for the sake of modularization.
 
@@ -87,7 +87,7 @@ core/mp_core.h:
     options.h contains the global option struct MPOpts, and its default values
     are in defaultopts.c for some reason.
 
-core/input/input.c:
+mpvcore/input/input.c:
     This translates keyboard input comming from libvo and other sources (such
     as remote control devices like Apple IR or slave mode commands) to the
     key bindings listed in the user's (or the builtin) input.conf and turns
@@ -99,14 +99,14 @@ core/input/input.c:
     direction of slave mode communication, mpv to application, consists of
     random mp_msg() calls all over the code in all parts of the player.)
 
-core/command.c:
+mpvcore/command.c:
     This contains the implementation for slave commands and properties.
     Properties are essentially dynamic variables changed by certain commands.
     This is basically responsible for all user commands, like initiating
     seeking, switching tracks, etc. It calls into mplayer.c, where most of the
     work is done, but also into other parts of mpv.
 
-core/mp_msg.h:
+mpvcore/mp_msg.h:
     All terminal output should go through mp_msg().
 
 stream/*:
@@ -223,7 +223,7 @@ sub/:
     detection as well as timing postprocessing work. (Timing postprocessing
     removes tiny gaps or overlaps between subtitle events.)
 
-core/timeline/:
+mpvcore/timeline/:
     A timeline is the abstraction used by mplayer.c to combine several files
     into one seemingly linear video. It's mainly used for ordered chapters
     playback. The high level code to find and load other files containing the

Makefile

@@ -88,7 +88,7 @@ SOURCES-$(GL)                   += video/out/gl_common.c video/out/gl_osd.c \
                                    video/out/pnm_loader.c
 
 SOURCES-$(ENCODING)             += video/out/vo_lavc.c audio/out/ao_lavc.c \
-                                   core/encode_lavc.c
+                                   mpvcore/encode_lavc.c
 
 SOURCES-$(GL_WIN32)             += video/out/w32_common.c video/out/gl_w32.c
 SOURCES-$(GL_X11)               += video/out/x11_common.c video/out/gl_x11.c
@@ -97,10 +97,10 @@ SOURCES-$(GL_WAYLAND)           += video/out/wayland_common.c \
                                    video/out/gl_wayland.c
 
 SOURCES-$(JACK)                 += audio/out/ao_jack.c
-SOURCES-$(JOYSTICK)             += core/input/joystick.c
-SOURCES-$(LIBQUVI)              += core/resolve_quvi.c
-SOURCES-$(LIBQUVI9)             += core/resolve_quvi9.c
-SOURCES-$(LIRC)                 += core/input/lirc.c
+SOURCES-$(JOYSTICK)             += mpvcore/input/joystick.c
+SOURCES-$(LIBQUVI)              += mpvcore/resolve_quvi.c
+SOURCES-$(LIBQUVI9)             += mpvcore/resolve_quvi9.c
+SOURCES-$(LIRC)                 += mpvcore/input/lirc.c
 SOURCES-$(OPENAL)               += audio/out/ao_openal.c
 SOURCES-$(OSS)                  += audio/out/ao_oss.c
 SOURCES-$(PULSE)                += audio/out/ao_pulse.c
@@ -160,34 +160,6 @@ SOURCES = talloc.c \
           audio/out/ao.c \
           audio/out/ao_null.c \
           audio/out/ao_pcm.c \
-          core/asxparser.c \
-          core/av_common.c \
-          core/av_log.c \
-          core/av_opts.c \
-          core/bstr.c \
-          core/charset_conv.c \
-          core/codecs.c \
-          core/command.c \
-          core/cpudetect.c \
-          core/m_config.c \
-          core/m_option.c \
-          core/m_property.c \
-          core/mp_common.c \
-          core/mp_msg.c \
-          core/mp_ring.c \
-          core/mplayer.c \
-          core/options.c \
-          core/parser-cfg.c \
-          core/parser-mpcmd.c \
-          core/path.c \
-          core/playlist.c \
-          core/playlist_parser.c \
-          core/screenshot.c \
-          core/version.c \
-          core/input/input.c \
-          core/timeline/tl_edl.c \
-          core/timeline/tl_matroska.c \
-          core/timeline/tl_cue.c \
           demux/codec_tags.c \
           demux/demux.c \
           demux/demux_edl.c \
@@ -199,6 +171,34 @@ SOURCES = talloc.c \
           demux/demux_raw.c \
           demux/ebml.c \
           demux/mf.c \
+          mpvcore/asxparser.c \
+          mpvcore/av_common.c \
+          mpvcore/av_log.c \
+          mpvcore/av_opts.c \
+          mpvcore/bstr.c \
+          mpvcore/charset_conv.c \
+          mpvcore/codecs.c \
+          mpvcore/command.c \
+          mpvcore/cpudetect.c \
+          mpvcore/m_config.c \
+          mpvcore/m_option.c \
+          mpvcore/m_property.c \
+          mpvcore/mp_common.c \
+          mpvcore/mp_msg.c \
+          mpvcore/mp_ring.c \
+          mpvcore/mplayer.c \
+          mpvcore/options.c \
+          mpvcore/parser-cfg.c \
+          mpvcore/parser-mpcmd.c \
+          mpvcore/path.c \
+          mpvcore/playlist.c \
+          mpvcore/playlist_parser.c \
+          mpvcore/screenshot.c \
+          mpvcore/version.c \
+          mpvcore/input/input.c \
+          mpvcore/timeline/tl_edl.c \
+          mpvcore/timeline/tl_matroska.c \
+          mpvcore/timeline/tl_cue.c \
           osdep/io.c \
           osdep/numcores.c \
           osdep/timer.c \
@@ -295,8 +295,8 @@ DIRS =  . \
         audio/filter \
         audio/out \
         core \
-        core/input \
-        core/timeline \
+        mpvcore/input \
+        mpvcore/timeline \
         demux \
         osdep \
         stream \
@@ -344,8 +344,8 @@ mpv$(EXESUF): $(OBJECTS)
 mpv$(EXESUF):
 	$(CC) -o $@ $^ $(EXTRALIBS)
 
-core/input/input.c: core/input/input_conf.h
-core/input/input_conf.h: TOOLS/file2string.pl etc/input.conf
+mpvcore/input/input.c: mpvcore/input/input_conf.h
+mpvcore/input/input_conf.h: TOOLS/file2string.pl etc/input.conf
 	./$^ >$@
 
 MKVLIB_DEPS = TOOLS/lib/Parse/Matroska.pm \
@@ -388,7 +388,7 @@ version.h .version: version.sh
 
 ###### dependency declarations / specific CFLAGS ######
 
-core/version.c osdep/mpv-rc.o: version.h
+mpvcore/version.c osdep/mpv-rc.o: version.h
 
 osdep/mpv-rc.o: osdep/mpv.exe.manifest etc/mpv-icon.ico
 
@@ -435,7 +435,7 @@ clean:
 	-$(RM) $(call ADD_ALL_EXESUFS,mpv)
 	-$(RM) DOCS/man/en/mpv.1
 	-$(RM) version.h
-	-$(RM) core/input/input_conf.h
+	-$(RM) mpvcore/input/input_conf.h
 	-$(RM) video/out/vdpau_template.c
 	-$(RM) demux/ebml_types.h demux/ebml_defs.c
 	-$(RM) video/out/gl_video_shaders.h

audio/audio.c

@@ -17,7 +17,7 @@
 
 #include <assert.h>
 
-#include "core/mp_talloc.h"
+#include "mpvcore/mp_talloc.h"
 #include "audio.h"
 
 void mp_audio_set_format(struct mp_audio *mpa, int format)

audio/chmap.c

@@ -18,7 +18,7 @@
 #include <stdlib.h>
 #include <assert.h>
 
-#include "core/mp_msg.h"
+#include "mpvcore/mp_msg.h"
 #include "chmap.h"
 
 // Names taken from libavutil/channel_layout.c (Not accessible by API.)

audio/chmap.h

@@ -20,7 +20,7 @@
 
 #include <inttypes.h>
 #include <stdbool.h>
-#include "core/bstr.h"
+#include "mpvcore/bstr.h"
 
 #define MP_NUM_CHANNELS 8
 

audio/decode/ad.h

@@ -19,7 +19,7 @@
 #ifndef MPLAYER_AD_H
 #define MPLAYER_AD_H
 
-#include "core/codecs.h"
+#include "mpvcore/codecs.h"
 #include "demux/stheader.h"
 #include "demux/demux.h"
 

audio/decode/ad_lavc.c

@@ -29,11 +29,11 @@
 #include "talloc.h"
 
 #include "config.h"
-#include "core/av_common.h"
-#include "core/codecs.h"
-#include "core/mp_msg.h"
-#include "core/options.h"
-#include "core/av_opts.h"
+#include "mpvcore/av_common.h"
+#include "mpvcore/codecs.h"
+#include "mpvcore/mp_msg.h"
+#include "mpvcore/options.h"
+#include "mpvcore/av_opts.h"
 
 #include "ad.h"
 #include "audio/reorder_ch.h"

audio/decode/ad_mpg123.c

@@ -25,7 +25,7 @@
 #include "config.h"
 
 #include "ad.h"
-#include "core/mp_msg.h"
+#include "mpvcore/mp_msg.h"
 
 /* Reducing the ifdeffery to two main variants:
  *   1. most compatible to any libmpg123 version

audio/decode/ad_spdif.c

@@ -25,9 +25,9 @@
 #include <libavutil/opt.h>
 
 #include "config.h"
-#include "core/mp_msg.h"
-#include "core/av_common.h"
-#include "core/options.h"
+#include "mpvcore/mp_msg.h"
+#include "mpvcore/av_common.h"
+#include "mpvcore/options.h"
 #include "ad.h"
 
 #define FILENAME_SPDIFENC "spdif"

audio/decode/dec_audio.c

@@ -26,9 +26,9 @@
 #include "demux/codec_tags.h"
 
 #include "config.h"
-#include "core/codecs.h"
-#include "core/mp_msg.h"
-#include "core/bstr.h"
+#include "mpvcore/codecs.h"
+#include "mpvcore/mp_msg.h"
+#include "mpvcore/bstr.h"
 
 #include "stream/stream.h"
 #include "demux/demux.h"

audio/filter/af.c

@@ -22,8 +22,8 @@
 #include <string.h>
 #include <assert.h>
 
-#include "core/m_option.h"
-#include "core/m_config.h"
+#include "mpvcore/m_option.h"
+#include "mpvcore/m_config.h"
 
 #include "af.h"
 

audio/filter/af.h

@@ -24,12 +24,12 @@
 
 #include "config.h"
 
-#include "core/options.h"
+#include "mpvcore/options.h"
 #include "audio/format.h"
 #include "audio/chmap.h"
 #include "audio/audio.h"
 #include "control.h"
-#include "core/mp_msg.h"
+#include "mpvcore/mp_msg.h"
 
 struct af_instance;
 

audio/filter/af_bs2b.c

@@ -27,7 +27,7 @@
 #include <string.h>
 
 #include "af.h"
-#include "core/m_option.h"
+#include "mpvcore/m_option.h"
 
 /// Internal specific data of the filter
 struct af_bs2b {

audio/filter/af_export.c

@@ -39,7 +39,7 @@
 
 #include "talloc.h"
 #include "af.h"
-#include "core/path.h"
+#include "mpvcore/path.h"
 
 #define DEF_SZ 512 // default buffer size (in samples)
 #define SHARED_FILE "mpv-af_export" /* default file name

audio/filter/af_force.c

@@ -19,7 +19,7 @@
 
 #include <libavutil/common.h>
 
-#include "core/m_option.h"
+#include "mpvcore/m_option.h"
 
 #include "audio/format.h"
 #include "af.h"

audio/filter/af_lavfi.c

@@ -38,8 +38,8 @@
 #include "audio/fmt-conversion.h"
 #include "af.h"
 
-#include "core/m_option.h"
-#include "core/av_opts.h"
+#include "mpvcore/m_option.h"
+#include "mpvcore/av_opts.h"
 
 #define IS_LIBAV_FORK (LIBAVFILTER_VERSION_MICRO < 100)
 

audio/filter/af_lavrresample.c

@@ -50,9 +50,9 @@
 #error "config.h broken"
 #endif
 
-#include "core/mp_msg.h"
-#include "core/m_option.h"
-#include "core/av_opts.h"
+#include "mpvcore/mp_msg.h"
+#include "mpvcore/m_option.h"
+#include "mpvcore/av_opts.h"
 #include "audio/filter/af.h"
 #include "audio/fmt-conversion.h"
 #include "audio/reorder_ch.h"

audio/filter/af_scaletempo.c

@@ -36,10 +36,10 @@
 #include <limits.h>
 #include <assert.h>
 
-#include "core/mp_common.h"
+#include "mpvcore/mp_common.h"
 
 #include "af.h"
-#include "core/m_option.h"
+#include "mpvcore/m_option.h"
 
 // Data for specific instances of this filter
 typedef struct af_scaletempo_s

audio/fmt-conversion.c

@@ -16,7 +16,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */ 
 
-#include "core/mp_msg.h"
+#include "mpvcore/mp_msg.h"
 #include <libavutil/avutil.h>
 #include <libavutil/samplefmt.h>
 #include "format.h"

audio/format.h

@@ -25,7 +25,7 @@
 
 #include <sys/types.h>
 #include "config.h"
-#include "core/bstr.h"
+#include "mpvcore/bstr.h"
 
 // Endianness
 #define AF_FORMAT_BE		(0<<0) // Big Endian