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

audio/mixer.c

@@ -23,7 +23,7 @@
 #include "config.h"
 #include "audio/out/ao.h"
 #include "audio/filter/af.h"
-#include "core/mp_msg.h"
+#include "mpvcore/mp_msg.h"
 #include "mixer.h"
 
 

audio/out/ao.c

@@ -27,10 +27,10 @@
 #include "ao.h"
 #include "audio/format.h"
 
-#include "core/options.h"
-#include "core/m_config.h"
-#include "core/mp_msg.h"
-#include "core/mpv_global.h"
+#include "mpvcore/options.h"
+#include "mpvcore/m_config.h"
+#include "mpvcore/mp_msg.h"
+#include "mpvcore/mpv_global.h"
 
 // there are some globals:
 struct ao *global_ao;

audio/out/ao.h

@@ -21,8 +21,8 @@
 
 #include <stdbool.h>
 
-#include "core/bstr.h"
-#include "core/mp_common.h"
+#include "mpvcore/bstr.h"
+#include "mpvcore/mp_common.h"
 #include "audio/chmap.h"
 #include "audio/chmap_sel.h"
 

audio/out/ao_alsa.c

@@ -36,10 +36,10 @@
 #include <alloca.h>
 
 #include "config.h"
-#include "core/options.h"
-#include "core/m_option.h"
+#include "mpvcore/options.h"
+#include "mpvcore/m_option.h"
 #include "audio/mixer.h"
-#include "core/mp_msg.h"
+#include "mpvcore/mp_msg.h"
 
 #define ALSA_PCM_NEW_HW_PARAMS_API
 #define ALSA_PCM_NEW_SW_PARAMS_API

audio/out/ao_coreaudio.c

@@ -36,9 +36,9 @@
 #include "ao.h"
 #include "audio/format.h"
 #include "osdep/timer.h"
-#include "core/m_option.h"
-#include "core/mp_ring.h"
-#include "core/mp_msg.h"
+#include "mpvcore/m_option.h"
+#include "mpvcore/mp_ring.h"
+#include "mpvcore/mp_msg.h"
 #include "audio/out/ao_coreaudio_properties.h"
 #include "audio/out/ao_coreaudio_utils.h"
 

audio/out/ao_coreaudio_utils.h

@@ -22,7 +22,7 @@
 #include <AudioToolbox/AudioToolbox.h>
 #include <inttypes.h>
 #include <stdbool.h>
-#include "core/mp_msg.h"
+#include "mpvcore/mp_msg.h"
 #include "audio/out/ao.h"
 
 #define CA_CFSTR_ENCODING kCFStringEncodingASCII

audio/out/ao_dsound.c

@@ -39,9 +39,9 @@
 #include "audio/format.h"
 #include "ao.h"
 #include "audio/reorder_ch.h"
-#include "core/mp_msg.h"
+#include "mpvcore/mp_msg.h"
 #include "osdep/timer.h"
-#include "core/m_option.h"
+#include "mpvcore/m_option.h"
 
 /**
 \todo use the definitions from the win32 api headers when they define these

audio/out/ao_jack.c

@@ -27,14 +27,14 @@
 #include <unistd.h>
 
 #include "config.h"
-#include "core/mp_msg.h"
+#include "mpvcore/mp_msg.h"
 
 #include "ao.h"
 #include "audio/format.h"
 #include "osdep/timer.h"
-#include "core/m_option.h"
+#include "mpvcore/m_option.h"
 
-#include "core/mp_ring.h"
+#include "mpvcore/mp_ring.h"
 
 #include <jack/jack.h>
 

audio/out/ao_lavc.c

@@ -28,15 +28,15 @@
 
 #include "compat/libav.h"
 #include "config.h"
-#include "core/options.h"
-#include "core/mp_common.h"
+#include "mpvcore/options.h"
+#include "mpvcore/mp_common.h"
 #include "audio/format.h"
 #include "audio/reorder_ch.h"
 #include "talloc.h"
 #include "ao.h"
-#include "core/mp_msg.h"
+#include "mpvcore/mp_msg.h"
 
-#include "core/encode_lavc.h"
+#include "mpvcore/encode_lavc.h"
 
 static const char *sample_padding_signed = "\x00\x00\x00\x00";
 static const char *sample_padding_u8     = "\x80";

audio/out/ao_openal.c

@@ -35,12 +35,12 @@
 #include <AL/alext.h>
 #endif
 
-#include "core/mp_msg.h"
+#include "mpvcore/mp_msg.h"
 
 #include "ao.h"
 #include "audio/format.h"
 #include "osdep/timer.h"
-#include "core/m_option.h"
+#include "mpvcore/m_option.h"
 
 #define MAX_CHANS MP_NUM_CHANNELS
 #define NUM_BUF 128

audio/out/ao_oss.c

@@ -34,8 +34,8 @@
 #include <string.h>
 
 #include "config.h"
-#include "core/options.h"
-#include "core/mp_msg.h"
+#include "mpvcore/options.h"
+#include "mpvcore/mp_msg.h"
 #include "audio/mixer.h"
 
 #ifdef HAVE_SYS_SOUNDCARD_H

audio/out/ao_pcm.c

@@ -28,11 +28,11 @@
 
 #include "talloc.h"
 
-#include "core/m_option.h"
+#include "mpvcore/m_option.h"
 #include "audio/format.h"
 #include "audio/reorder_ch.h"
 #include "ao.h"
-#include "core/mp_msg.h"
+#include "mpvcore/mp_msg.h"
 
 #ifdef __MINGW32__
 // for GetFileType to detect pipes

audio/out/ao_portaudio.c

@@ -26,10 +26,10 @@
 #include <portaudio.h>
 
 #include "config.h"
-#include "core/m_option.h"
+#include "mpvcore/m_option.h"
 #include "audio/format.h"
-#include "core/mp_msg.h"
-#include "core/mp_ring.h"
+#include "mpvcore/mp_msg.h"
+#include "mpvcore/mp_ring.h"
 #include "ao.h"
 
 struct priv {

audio/out/ao_pulse.c

@@ -28,9 +28,9 @@
 
 #include "config.h"
 #include "audio/format.h"
-#include "core/mp_msg.h"
+#include "mpvcore/mp_msg.h"
 #include "ao.h"
-#include "core/input/input.h"
+#include "mpvcore/input/input.h"
 
 #define PULSE_CLIENT_NAME "mpv"
 

audio/out/ao_rsound.c

@@ -29,7 +29,7 @@
 
 #include "talloc.h"
 
-#include "core/m_option.h"
+#include "mpvcore/m_option.h"
 #include "osdep/timer.h"
 #include "audio/format.h"
 #include "ao.h"

audio/out/ao_sdl.c

@@ -23,8 +23,8 @@
 #include "audio/format.h"
 #include "talloc.h"
 #include "ao.h"
-#include "core/mp_msg.h"
-#include "core/m_option.h"
+#include "mpvcore/mp_msg.h"
+#include "mpvcore/m_option.h"
 #include "osdep/timer.h"
 
 #include <libavutil/fifo.h>

audio/out/ao_wasapi.c

@@ -28,11 +28,11 @@
 #include <avrt.h>
 
 #include "config.h"
-#include "core/m_option.h"
-#include "core/m_config.h"
+#include "mpvcore/m_option.h"
+#include "mpvcore/m_config.h"
 #include "audio/format.h"
-#include "core/mp_msg.h"
-#include "core/mp_ring.h"
+#include "mpvcore/mp_msg.h"
+#include "mpvcore/mp_ring.h"
 #include "ao.h"
 
 #ifndef BASE_SEARCH_PATH_ENABLE_SAFE_SEARCHMODE

demux/codec_tags.c

@@ -20,7 +20,7 @@
 #include <libavutil/common.h>
 #include "codec_tags.h"
 #include "stheader.h"
-#include "core/av_common.h"
+#include "mpvcore/av_common.h"
 
 /* The following tables map FourCCs to codec names (as defined by libavcodec).
  * However, this includes only names that are not defined by libavformat's

demux/demux.c

@@ -29,10 +29,10 @@
 #include <sys/stat.h>
 
 #include "config.h"
-#include "core/options.h"
-#include "core/av_common.h"
+#include "mpvcore/options.h"
+#include "mpvcore/av_common.h"
 #include "talloc.h"
-#include "core/mp_msg.h"
+#include "mpvcore/mp_msg.h"
 
 #include "stream/stream.h"
 #include "demux.h"

demux/demux.h

@@ -25,8 +25,8 @@
 #include <string.h>
 #include <stdbool.h>
 
-#include "core/bstr.h"
-#include "core/mp_common.h"
+#include "mpvcore/bstr.h"
+#include "mpvcore/mp_common.h"
 #include "demux_packet.h"
 #include "stheader.h"
 

demux/demux_cue.c

@@ -22,7 +22,7 @@
 #include <stdbool.h>
 #include <string.h>
 
-#include "core/bstr.h"
+#include "mpvcore/bstr.h"
 #include "demux.h"
 #include "stream/stream.h"
 

demux/demux_lavf.c

@@ -35,16 +35,16 @@
 #include "compat/libav.h"
 
 #include "config.h"
-#include "core/options.h"
-#include "core/mp_msg.h"
-#include "core/av_opts.h"
-#include "core/av_common.h"
-#include "core/bstr.h"
+#include "mpvcore/options.h"
+#include "mpvcore/mp_msg.h"
+#include "mpvcore/av_opts.h"
+#include "mpvcore/av_common.h"
+#include "mpvcore/bstr.h"
 
 #include "stream/stream.h"
 #include "demux.h"
 #include "stheader.h"
-#include "core/m_option.h"
+#include "mpvcore/m_option.h"
 
 #define INITIAL_PROBE_SIZE STREAM_BUFFER_SIZE
 #define PROBE_BUF_SIZE FFMIN(STREAM_MAX_BUFFER_SIZE, 2 * 1024 * 1024)

demux/demux_libass.c

@@ -21,9 +21,9 @@
 #include <ass/ass.h>
 #include <ass/ass_types.h>
 
-#include "core/options.h"
-#include "core/mp_msg.h"
-#include "core/charset_conv.h"
+#include "mpvcore/options.h"
+#include "mpvcore/mp_msg.h"
+#include "mpvcore/charset_conv.h"
 #include "stream/stream.h"
 #include "demux.h"
 

demux/demux_mf.c

@@ -27,7 +27,7 @@
 
 #include "talloc.h"
 #include "config.h"
-#include "core/mp_msg.h"
+#include "mpvcore/mp_msg.h"
 
 #include "stream/stream.h"
 #include "demux.h"

demux/demux_mkv.c

@@ -42,8 +42,8 @@
 #endif
 
 #include "talloc.h"
-#include "core/options.h"
-#include "core/bstr.h"
+#include "mpvcore/options.h"
+#include "mpvcore/bstr.h"
 #include "stream/stream.h"
 #include "demux.h"
 #include "stheader.h"
@@ -51,7 +51,7 @@
 #include "matroska.h"
 #include "codec_tags.h"
 
-#include "core/mp_msg.h"
+#include "mpvcore/mp_msg.h"
 
 static const unsigned char sipr_swaps[38][2] = {
     {0,63},{1,22},{2,44},{3,90},{5,81},{7,31},{8,86},{9,58},{10,36},{12,68},

demux/demux_mng.c

@@ -26,7 +26,7 @@
 
 #include "config.h"
 
-#include "core/mp_msg.h"
+#include "mpvcore/mp_msg.h"
 
 #include "stream/stream.h"
 #include "demux.h"

demux/demux_raw.c

@@ -23,7 +23,7 @@
 #include <unistd.h>
 #include <string.h>
 
-#include "core/m_option.h"
+#include "mpvcore/m_option.h"
 
 #include "stream/stream.h"
 #include "demux.h"

demux/demux_subreader.c

@@ -32,9 +32,9 @@
 #include <libavutil/avstring.h>
 
 #include "config.h"
-#include "core/mp_msg.h"
-#include "core/mp_common.h"
-#include "core/options.h"
+#include "mpvcore/mp_msg.h"
+#include "mpvcore/mp_common.h"
+#include "mpvcore/options.h"
 #include "stream/stream.h"
 #include "demux/demux.h"
 

demux/ebml.c

@@ -35,7 +35,7 @@
 #include "ebml.h"
 #include "stream/stream.h"
 #include "compat/mpbswap.h"
-#include "core/mp_msg.h"
+#include "mpvcore/mp_msg.h"
 
 #ifndef SIZE_MAX
 #define SIZE_MAX ((size_t)-1)

demux/ebml.h

@@ -24,7 +24,7 @@
 #include <stdbool.h>
 
 #include "stream/stream.h"
-#include "core/bstr.h"
+#include "mpvcore/bstr.h"
 
 
 /* EBML version supported */

demux/mf.c

@@ -36,9 +36,9 @@
 #include "osdep/glob.h"
 #endif
 
-#include "core/mp_msg.h"
+#include "mpvcore/mp_msg.h"
 #include "stream/stream.h"
-#include "core/path.h"
+#include "mpvcore/path.h"
 
 #include "mf.h"
 

mpvcore/asxparser.c

@@ -28,7 +28,7 @@
 #include "playlist_parser.h"
 #include "stream/stream.h"
 #include "asxparser.h"
-#include "core/mp_msg.h"
+#include "mpvcore/mp_msg.h"
 
 
 typedef struct ASX_Parser_t ASX_Parser_t;

mpvcore/av_common.c

@@ -20,7 +20,7 @@
 #include <libavutil/common.h>
 #include <libavcodec/avcodec.h>
 
-#include "core/mp_talloc.h"
+#include "mpvcore/mp_talloc.h"
 #include "demux/demux_packet.h"
 #include "av_common.h"
 #include "codecs.h"

mpvcore/av_log.c

@@ -25,7 +25,7 @@
 
 #include "av_log.h"
 #include "config.h"
-#include "core/mp_msg.h"
+#include "mpvcore/mp_msg.h"
 #include <libavutil/avutil.h>
 #include <libavutil/log.h>
 

mpvcore/bstr.c

@@ -25,7 +25,7 @@
 
 #include "talloc.h"
 
-#include "core/bstr.h"
+#include "mpvcore/bstr.h"
 
 int bstrcmp(struct bstr str1, struct bstr str2)
 {

mpvcore/charset_conv.c

@@ -25,7 +25,7 @@
 
 #include "config.h"
 
-#include "core/mp_msg.h"
+#include "mpvcore/mp_msg.h"
 
 #ifdef CONFIG_ENCA
 #include <enca.h>

mpvcore/charset_conv.h

@@ -2,7 +2,7 @@
 #define MP_CHARSET_CONV_H
 
 #include <stdbool.h>
-#include "core/bstr.h"
+#include "mpvcore/bstr.h"
 
 enum {
     MP_ICONV_VERBOSE = 1,       // print errors instead of failing silently

mpvcore/codecs.c

@@ -16,9 +16,9 @@
  */
 
 #include <assert.h>
-#include "core/mp_talloc.h"
-#include "core/bstr.h"
-#include "core/mp_msg.h"
+#include "mpvcore/mp_talloc.h"
+#include "mpvcore/bstr.h"
+#include "mpvcore/mp_msg.h"
 #include "codecs.h"
 
 void mp_add_decoder(struct mp_decoder_list *list, const char *family,

mpvcore/command.c

@@ -39,7 +39,7 @@
 #include "playlist_parser.h"
 #include "sub/sub.h"
 #include "sub/dec_sub.h"
-#include "core/m_option.h"
+#include "mpvcore/m_option.h"
 #include "m_property.h"
 #include "m_config.h"
 #include "video/filter/vf.h"
@@ -50,11 +50,11 @@
 #include "playlist.h"
 #include "audio/mixer.h"
 #include "audio/out/ao.h"
-#include "core/mp_common.h"
+#include "mpvcore/mp_common.h"
 #include "audio/filter/af.h"
 #include "video/decode/dec_video.h"
 #include "audio/decode/dec_audio.h"
-#include "core/path.h"
+#include "mpvcore/path.h"
 #include "stream/tv.h"
 #include "stream/stream_radio.h"
 #include "stream/pvr.h"
@@ -66,7 +66,7 @@
 #endif
 #include "screenshot.h"
 
-#include "core/mp_core.h"
+#include "mpvcore/mp_core.h"
 
 static void change_video_filters(MPContext *mpctx, const char *cmd,
                                  const char *arg);

mpvcore/cpudetect.c

@@ -24,8 +24,8 @@
 #include "compat/libav.h"
 
 #include "config.h"
-#include "core/cpudetect.h"
-#include "core/mp_msg.h"
+#include "mpvcore/cpudetect.h"
+#include "mpvcore/mp_msg.h"
 
 CpuCaps gCpuCaps;
 

mpvcore/encode_lavc.c

@@ -22,9 +22,9 @@
 
 
 #include "encode_lavc.h"
-#include "core/mp_msg.h"
+#include "mpvcore/mp_msg.h"
 #include "video/vfcap.h"
-#include "core/options.h"
+#include "mpvcore/options.h"
 #include "osdep/timer.h"
 #include "video/out/vo.h"
 #include "talloc.h"

mpvcore/input/input.c

@@ -40,15 +40,15 @@
 #include "input.h"
 #include "keycodes.h"
 #include "osdep/timer.h"
-#include "core/mp_msg.h"
-#include "core/m_config.h"
-#include "core/m_option.h"
-#include "core/path.h"
+#include "mpvcore/mp_msg.h"
+#include "mpvcore/m_config.h"
+#include "mpvcore/m_option.h"
+#include "mpvcore/path.h"
 #include "talloc.h"
-#include "core/options.h"
-#include "core/bstr.h"
+#include "mpvcore/options.h"
+#include "mpvcore/bstr.h"
 #include "stream/stream.h"
-#include "core/mp_common.h"
+#include "mpvcore/mp_common.h"
 
 #include "joystick.h"
 
@@ -592,7 +592,7 @@ const m_option_t mp_input_opts[] = {
 static int default_cmd_func(int fd, char *buf, int l);
 
 static const char builtin_input_conf[] =
-#include "core/input/input_conf.h"
+#include "mpvcore/input/input_conf.h"
 ;
 
 static bool test_rect(struct mp_rect *rc, int x, int y)

mpvcore/input/input.h

@@ -20,8 +20,8 @@
 #define MPLAYER_INPUT_H
 
 #include <stdbool.h>
-#include "core/bstr.h"
-#include "core/m_option.h"
+#include "mpvcore/bstr.h"
+#include "mpvcore/m_option.h"
 
 // All command IDs
 enum mp_command_type {

mpvcore/input/joystick.c

@@ -30,7 +30,7 @@
 #include <fcntl.h>
 #include <errno.h>
 
-#include "core/mp_msg.h"
+#include "mpvcore/mp_msg.h"
 #include "keycodes.h"
 
 #ifndef JOY_AXIS_DELTA

mpvcore/input/lirc.c

@@ -26,7 +26,7 @@
 #include <unistd.h>
 #include <stdlib.h>
 
-#include "core/mp_msg.h"
+#include "mpvcore/mp_msg.h"
 #include "input.h"
 #include "lirc.h"
 

mpvcore/m_config.c

@@ -31,8 +31,8 @@
 #include "talloc.h"
 
 #include "m_config.h"
-#include "core/m_option.h"
-#include "core/mp_msg.h"
+#include "mpvcore/m_option.h"
+#include "mpvcore/mp_msg.h"
 
 // Profiles allow to predefine some sets of options that can then
 // be applied later on with the internal -profile option.

mpvcore/m_config.h

@@ -22,7 +22,7 @@
 #include <stddef.h>
 #include <stdbool.h>
 
-#include "core/bstr.h"
+#include "mpvcore/bstr.h"
 
 // m_config provides an API to manipulate the config variables in MPlayer.
 // It makes use of the Options API to provide a context stack that

mpvcore/m_option.c

@@ -36,10 +36,10 @@
 #include <libavutil/avstring.h>
 
 #include "talloc.h"
-#include "core/mp_common.h"
-#include "core/m_option.h"
-#include "core/m_config.h"
-#include "core/mp_msg.h"
+#include "mpvcore/mp_common.h"
+#include "mpvcore/m_option.h"
+#include "mpvcore/m_config.h"
+#include "mpvcore/mp_msg.h"
 
 char *m_option_strerror(int code)
 {

mpvcore/m_option.h

@@ -24,7 +24,7 @@
 #include <stdbool.h>
 
 #include "config.h"
-#include "core/bstr.h"
+#include "mpvcore/bstr.h"
 #include "audio/chmap.h"
 
 // m_option allows to parse, print and copy data of various types.

mpvcore/m_property.c

@@ -30,10 +30,10 @@
 #include <libavutil/common.h>
 
 #include "talloc.h"
-#include "core/m_option.h"
+#include "mpvcore/m_option.h"
 #include "m_property.h"
-#include "core/mp_msg.h"
-#include "core/mp_common.h"
+#include "mpvcore/mp_msg.h"
+#include "mpvcore/mp_common.h"
 
 const struct m_option_type m_option_type_dummy = {
     .name = "Unknown",

mpvcore/mp_common.c

@@ -19,8 +19,8 @@
 #include <libavutil/common.h>
 
 #include "talloc.h"
-#include "core/bstr.h"
-#include "core/mp_common.h"
+#include "mpvcore/bstr.h"
+#include "mpvcore/mp_common.h"
 
 char *mp_format_time(double time, bool fractions)
 {

mpvcore/mp_common.h

@@ -24,7 +24,7 @@
 #include <stdint.h>
 
 #include "compat/compiler.h"
-#include "core/mp_talloc.h"
+#include "mpvcore/mp_talloc.h"
 
 // both int64_t and double should be able to represent this exactly
 #define MP_NOPTS_VALUE (-1LL<<63)

mpvcore/mp_core.h

@@ -21,7 +21,7 @@
 
 #include <stdbool.h>
 
-#include "core/options.h"
+#include "mpvcore/options.h"
 #include "audio/mixer.h"
 #include "demux/demux.h"
 

mpvcore/mp_msg.c

@@ -26,7 +26,7 @@
 #include "talloc.h"
 
 #include "config.h"
-#include "core/mpv_global.h"
+#include "mpvcore/mpv_global.h"
 #include "osdep/getch2.h"
 #include "osdep/io.h"
 
@@ -39,7 +39,7 @@
 #include <signal.h>
 #endif
 
-#include "core/mp_msg.h"
+#include "mpvcore/mp_msg.h"
 
 bool mp_msg_stdout_in_use = 0;
 

mpvcore/mp_msg.h

@@ -135,7 +135,7 @@ int mp_msg_test(int mod, int lev);
 bool mp_msg_test_log(struct mp_log *log, int lev);
 
 #include "config.h"
-#include "core/mp_common.h"
+#include "mpvcore/mp_common.h"
 
 char *mp_gtext(const char *string);
 

mpvcore/mp_ring.c

@@ -21,8 +21,8 @@
 #include <libavutil/common.h>
 #include <assert.h>
 #include "talloc.h"
-#include "core/mp_memory_barrier.h"
-#include "core/mp_ring.h"
+#include "mpvcore/mp_memory_barrier.h"
+#include "mpvcore/mp_ring.h"
 
 struct mp_ring {
     uint8_t  *buffer;

mpvcore/mplayer.c

@@ -63,26 +63,26 @@
 
 #include <errno.h>
 
-#include "core/mpv_global.h"
-#include "core/mp_msg.h"
+#include "mpvcore/mpv_global.h"
+#include "mpvcore/mp_msg.h"
 #include "av_log.h"
 
 
-#include "core/m_option.h"
-#include "core/m_config.h"
-#include "core/resolve.h"
-#include "core/m_property.h"
+#include "mpvcore/m_option.h"
+#include "mpvcore/m_config.h"
+#include "mpvcore/resolve.h"
+#include "mpvcore/m_property.h"
 
 #include "sub/find_subfiles.h"
 #include "sub/dec_sub.h"
 #include "sub/sd.h"
 
-#include "core/mp_osd.h"
+#include "mpvcore/mp_osd.h"
 #include "video/out/vo.h"
-#include "core/screenshot.h"
+#include "mpvcore/screenshot.h"
 
 #include "sub/sub.h"
-#include "core/cpudetect.h"
+#include "mpvcore/cpudetect.h"
 
 #ifdef CONFIG_X11
 #include "video/out/x11_common.h"
@@ -94,13 +94,13 @@
 
 #include "audio/out/ao.h"
 
-#include "core/codecs.h"
+#include "mpvcore/codecs.h"
 
 #include "osdep/getch2.h"
 #include "osdep/timer.h"
 
-#include "core/input/input.h"
-#include "core/encode.h"
+#include "mpvcore/input/input.h"
+#include "mpvcore/encode.h"
 
 #include "osdep/priority.h"
 
@@ -113,20 +113,20 @@
 //**************************************************************************//
 //             Playtree
 //**************************************************************************//
-#include "core/playlist.h"
-#include "core/playlist_parser.h"
+#include "mpvcore/playlist.h"
+#include "mpvcore/playlist_parser.h"
 
 //**************************************************************************//
 //             Config
 //**************************************************************************//
-#include "core/parser-cfg.h"
-#include "core/parser-mpcmd.h"
+#include "mpvcore/parser-cfg.h"
+#include "mpvcore/parser-mpcmd.h"
 
 //**************************************************************************//
 //             Config file
 //**************************************************************************//
 
-#include "core/path.h"
+#include "mpvcore/path.h"
 
 //**************************************************************************//
 //**************************************************************************//
@@ -146,8 +146,8 @@
 
 #include "audio/mixer.h"
 
-#include "core/mp_core.h"
-#include "core/options.h"
+#include "mpvcore/mp_core.h"
+#include "mpvcore/options.h"
 
 const char mp_help_text[] = _(
 "Usage:   mpv [options] [url|path/]filename\n"
@@ -192,8 +192,8 @@ static const char av_desync_help_text[] = _(
 
 // ---
 
-#include "core/mp_common.h"
-#include "core/command.h"
+#include "mpvcore/mp_common.h"
+#include "mpvcore/command.h"
 
 static void reset_subtitles(struct MPContext *mpctx);
 static void reinit_subs(struct MPContext *mpctx);

mpvcore/options.c

@@ -27,10 +27,10 @@
 #include <sys/types.h>
 #include <limits.h>
 
-#include "core/options.h"
+#include "mpvcore/options.h"
 #include "config.h"
-#include "core/m_config.h"
-#include "core/m_option.h"
+#include "mpvcore/m_config.h"
+#include "mpvcore/m_option.h"
 #include "stream/tv.h"
 #include "stream/stream_radio.h"
 #include "video/csputils.h"

mpvcore/options.h

@@ -3,7 +3,7 @@
 
 #include <stdbool.h>
 #include <stdint.h>
-#include "core/m_option.h"
+#include "mpvcore/m_option.h"
 
 typedef struct mp_vo_opts {
     struct m_obj_settings *video_driver_list;

mpvcore/parser-cfg.c

@@ -28,8 +28,8 @@
 #include "osdep/io.h"
 
 #include "parser-cfg.h"
-#include "core/mp_msg.h"
-#include "core/m_option.h"
+#include "mpvcore/mp_msg.h"
+#include "mpvcore/m_option.h"
 #include "m_config.h"
 
 /// Maximal include depth.

mpvcore/parser-mpcmd.c

@@ -25,8 +25,8 @@
 #include <assert.h>
 #include <stdbool.h>
 
-#include "core/mp_msg.h"
-#include "core/m_option.h"
+#include "mpvcore/mp_msg.h"
+#include "mpvcore/m_option.h"
 #include "m_config.h"
 #include "playlist.h"
 #include "playlist_parser.h"

mpvcore/path.c

@@ -33,8 +33,8 @@
 #include <unistd.h>
 #include <errno.h>
 #include "config.h"
-#include "core/mp_msg.h"
-#include "core/path.h"
+#include "mpvcore/mp_msg.h"
+#include "mpvcore/path.h"
 #include "talloc.h"
 #include "osdep/io.h"
 

mpvcore/path.h

@@ -22,7 +22,7 @@
 #define MPLAYER_PATH_H
 
 #include <stdbool.h>
-#include "core/bstr.h"
+#include "mpvcore/bstr.h"
 
 
 // Search for the input filename in several paths. These include user and global

mpvcore/playlist.c

@@ -18,9 +18,9 @@
 #include <assert.h>
 #include "config.h"
 #include "playlist.h"
-#include "core/mp_common.h"
+#include "mpvcore/mp_common.h"
 #include "talloc.h"
-#include "core/path.h"
+#include "mpvcore/path.h"
 
 struct playlist_entry *playlist_entry_new(const char *filename)
 {

mpvcore/playlist.h

@@ -19,7 +19,7 @@
 #define MPLAYER_PLAYLIST_H
 
 #include <stdbool.h>
-#include "core/bstr.h"
+#include "mpvcore/bstr.h"
 
 struct playlist_param {
     bstr name, value;

mpvcore/playlist_parser.c

@@ -36,8 +36,8 @@
 #include "playlist_parser.h"
 #include "stream/stream.h"
 #include "demux/demux.h"
-#include "core/mp_msg.h"
-#include "core/path.h"
+#include "mpvcore/mp_msg.h"
+#include "mpvcore/path.h"
 
 
 #define BUF_STEP 1024

mpvcore/resolve_quvi.c

@@ -19,8 +19,8 @@
 #include <quvi/quvi.h>
 
 #include "talloc.h"
-#include "core/mp_msg.h"
-#include "core/options.h"
+#include "mpvcore/mp_msg.h"
+#include "mpvcore/options.h"
 #include "resolve.h"
 
 struct mp_resolve_result *mp_resolve_quvi(const char *url, struct MPOpts *opts)

mpvcore/resolve_quvi9.c

@@ -21,9 +21,9 @@
 #include <quvi.h>
 
 #include "talloc.h"
-#include "core/mp_msg.h"
-#include "core/options.h"
-#include "core/playlist.h"
+#include "mpvcore/mp_msg.h"
+#include "mpvcore/options.h"
+#include "mpvcore/playlist.h"
 #include "resolve.h"
 
 static bool mp_quvi_ok(quvi_t q)

mpvcore/screenshot.c

@@ -25,13 +25,13 @@
 #include "osdep/io.h"
 
 #include "talloc.h"
-#include "core/screenshot.h"
-#include "core/mp_core.h"
-#include "core/command.h"
-#include "core/bstr.h"
-#include "core/mp_msg.h"
-#include "core/mp_osd.h"
-#include "core/path.h"
+#include "mpvcore/screenshot.h"
+#include "mpvcore/mp_core.h"
+#include "mpvcore/command.h"
+#include "mpvcore/bstr.h"
+#include "mpvcore/mp_msg.h"
+#include "mpvcore/mp_osd.h"
+#include "mpvcore/path.h"
 #include "video/mp_image.h"
 #include "video/decode/dec_video.h"
 #include "video/filter/vf.h"

mpvcore/timeline/tl_cue.c

@@ -24,12 +24,12 @@
 
 #include "talloc.h"
 
-#include "core/mp_core.h"
-#include "core/mp_msg.h"
+#include "mpvcore/mp_core.h"
+#include "mpvcore/mp_msg.h"
 #include "demux/demux.h"
-#include "core/path.h"
-#include "core/bstr.h"
-#include "core/mp_common.h"
+#include "mpvcore/path.h"
+#include "mpvcore/bstr.h"
+#include "mpvcore/mp_common.h"
 #include "stream/stream.h"
 
 // used by demuxer_cue.c

mpvcore/timeline/tl_edl.c

@@ -23,12 +23,12 @@
 
 #include "talloc.h"
 
-#include "core/mp_core.h"
-#include "core/mp_msg.h"
+#include "mpvcore/mp_core.h"
+#include "mpvcore/mp_msg.h"
 #include "demux/demux.h"
-#include "core/path.h"
-#include "core/bstr.h"
-#include "core/mp_common.h"
+#include "mpvcore/path.h"
+#include "mpvcore/bstr.h"
+#include "mpvcore/mp_common.h"
 #include "stream/stream.h"
 
 

mpvcore/timeline/tl_matroska.c

@@ -30,12 +30,12 @@
 
 #include "talloc.h"
 
-#include "core/mp_core.h"
-#include "core/mp_msg.h"
+#include "mpvcore/mp_core.h"
+#include "mpvcore/mp_msg.h"
 #include "demux/demux.h"
-#include "core/path.h"
-#include "core/bstr.h"
-#include "core/mp_common.h"
+#include "mpvcore/path.h"
+#include "mpvcore/bstr.h"
+#include "mpvcore/mp_common.h"
 #include "stream/stream.h"
 
 struct find_entry {

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)

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

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"

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)
 {

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);

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"
 

osdep/priority.c

@@ -26,7 +26,7 @@
 
 #include <string.h>
 
-#include "core/mp_msg.h"
+#include "mpvcore/mp_msg.h"
 
 #include "priority.h"