diff --git a/.gitignore b/.gitignore index 79fa978ed40df..b38112e747025 100644 --- a/.gitignore +++ b/.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 diff --git a/DOCS/tech-overview.txt b/DOCS/tech-overview.txt index d4dbd9593899b..d83b00c82928e 100644 --- a/DOCS/tech-overview.txt +++ b/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 diff --git a/Makefile b/Makefile index eaa6449415fea..be182e394ec56 100644 --- a/Makefile +++ b/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 diff --git a/audio/audio.c b/audio/audio.c index c9d5c9231c3fd..e1d3a76978c8b 100644 --- a/audio/audio.c +++ b/audio/audio.c @@ -17,7 +17,7 @@ #include -#include "core/mp_talloc.h" +#include "mpvcore/mp_talloc.h" #include "audio.h" void mp_audio_set_format(struct mp_audio *mpa, int format) diff --git a/audio/chmap.c b/audio/chmap.c index 254d9b38da3d3..0e714f3c838b1 100644 --- a/audio/chmap.c +++ b/audio/chmap.c @@ -18,7 +18,7 @@ #include #include -#include "core/mp_msg.h" +#include "mpvcore/mp_msg.h" #include "chmap.h" // Names taken from libavutil/channel_layout.c (Not accessible by API.) diff --git a/audio/chmap.h b/audio/chmap.h index 1848c86efda4e..cd6c49f7168dd 100644 --- a/audio/chmap.h +++ b/audio/chmap.h @@ -20,7 +20,7 @@ #include #include -#include "core/bstr.h" +#include "mpvcore/bstr.h" #define MP_NUM_CHANNELS 8 diff --git a/audio/decode/ad.h b/audio/decode/ad.h index 3b18c7e977871..1d9ac13e356af 100644 --- a/audio/decode/ad.h +++ b/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" diff --git a/audio/decode/ad_lavc.c b/audio/decode/ad_lavc.c index da7c5aeaadbaa..409fda495103d 100644 --- a/audio/decode/ad_lavc.c +++ b/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" diff --git a/audio/decode/ad_mpg123.c b/audio/decode/ad_mpg123.c index d8cc702234b40..9594cb61ef9ed 100644 --- a/audio/decode/ad_mpg123.c +++ b/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 diff --git a/audio/decode/ad_spdif.c b/audio/decode/ad_spdif.c index f3a6e3dd1fcd1..a53513dead527 100644 --- a/audio/decode/ad_spdif.c +++ b/audio/decode/ad_spdif.c @@ -25,9 +25,9 @@ #include #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" diff --git a/audio/decode/dec_audio.c b/audio/decode/dec_audio.c index a73027e2242b9..c368350f7180c 100644 --- a/audio/decode/dec_audio.c +++ b/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" diff --git a/audio/filter/af.c b/audio/filter/af.c index 91f3e907f1b2e..7a8dc406cffb7 100644 --- a/audio/filter/af.c +++ b/audio/filter/af.c @@ -22,8 +22,8 @@ #include #include -#include "core/m_option.h" -#include "core/m_config.h" +#include "mpvcore/m_option.h" +#include "mpvcore/m_config.h" #include "af.h" diff --git a/audio/filter/af.h b/audio/filter/af.h index df4e03b49acea..23dfa9d4fbbf4 100644 --- a/audio/filter/af.h +++ b/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; diff --git a/audio/filter/af_bs2b.c b/audio/filter/af_bs2b.c index a75be27f8a443..e8178ea54976b 100644 --- a/audio/filter/af_bs2b.c +++ b/audio/filter/af_bs2b.c @@ -27,7 +27,7 @@ #include #include "af.h" -#include "core/m_option.h" +#include "mpvcore/m_option.h" /// Internal specific data of the filter struct af_bs2b { diff --git a/audio/filter/af_export.c b/audio/filter/af_export.c index ea0aa938cadf2..b4286c0e62a63 100644 --- a/audio/filter/af_export.c +++ b/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 diff --git a/audio/filter/af_force.c b/audio/filter/af_force.c index 75424167b934e..adf17c61f208a 100644 --- a/audio/filter/af_force.c +++ b/audio/filter/af_force.c @@ -19,7 +19,7 @@ #include -#include "core/m_option.h" +#include "mpvcore/m_option.h" #include "audio/format.h" #include "af.h" diff --git a/audio/filter/af_lavfi.c b/audio/filter/af_lavfi.c index 3a0929b62229a..6b8a66d3262a7 100644 --- a/audio/filter/af_lavfi.c +++ b/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) diff --git a/audio/filter/af_lavrresample.c b/audio/filter/af_lavrresample.c index 177f4048b968b..52df9c2810a6c 100644 --- a/audio/filter/af_lavrresample.c +++ b/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" diff --git a/audio/filter/af_scaletempo.c b/audio/filter/af_scaletempo.c index d409ed85cfb27..dfc830799bccc 100644 --- a/audio/filter/af_scaletempo.c +++ b/audio/filter/af_scaletempo.c @@ -36,10 +36,10 @@ #include #include -#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 diff --git a/audio/fmt-conversion.c b/audio/fmt-conversion.c index 4c1055f118b4b..ce2a9054bf2a3 100644 --- a/audio/fmt-conversion.c +++ b/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 #include #include "format.h" diff --git a/audio/format.h b/audio/format.h index f3aa3d8af087f..01478afc52bc8 100644 --- a/audio/format.h +++ b/audio/format.h @@ -25,7 +25,7 @@ #include #include "config.h" -#include "core/bstr.h" +#include "mpvcore/bstr.h" // Endianness #define AF_FORMAT_BE (0<<0) // Big Endian diff --git a/audio/mixer.c b/audio/mixer.c index 7ccfaa4639520..d3762628aecee 100644 --- a/audio/mixer.c +++ b/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" diff --git a/audio/out/ao.c b/audio/out/ao.c index 49fffb657d406..5f5ad4d38c8f6 100644 --- a/audio/out/ao.c +++ b/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; diff --git a/audio/out/ao.h b/audio/out/ao.h index 65e5a3fc6b026..673a252ccba39 100644 --- a/audio/out/ao.h +++ b/audio/out/ao.h @@ -21,8 +21,8 @@ #include -#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" diff --git a/audio/out/ao_alsa.c b/audio/out/ao_alsa.c index 9b1c32181d7ba..63309c3dbdf70 100644 --- a/audio/out/ao_alsa.c +++ b/audio/out/ao_alsa.c @@ -36,10 +36,10 @@ #include #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 diff --git a/audio/out/ao_coreaudio.c b/audio/out/ao_coreaudio.c index 59e1f82f36a27..a7e7b11966704 100644 --- a/audio/out/ao_coreaudio.c +++ b/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" diff --git a/audio/out/ao_coreaudio_utils.h b/audio/out/ao_coreaudio_utils.h index 96383f9870eaa..296f1d249795c 100644 --- a/audio/out/ao_coreaudio_utils.h +++ b/audio/out/ao_coreaudio_utils.h @@ -22,7 +22,7 @@ #include #include #include -#include "core/mp_msg.h" +#include "mpvcore/mp_msg.h" #include "audio/out/ao.h" #define CA_CFSTR_ENCODING kCFStringEncodingASCII diff --git a/audio/out/ao_dsound.c b/audio/out/ao_dsound.c index 4e85460243dbc..039df2a7eda9d 100644 --- a/audio/out/ao_dsound.c +++ b/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 diff --git a/audio/out/ao_jack.c b/audio/out/ao_jack.c index ba855cce23893..579dee2631435 100644 --- a/audio/out/ao_jack.c +++ b/audio/out/ao_jack.c @@ -27,14 +27,14 @@ #include #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 diff --git a/audio/out/ao_lavc.c b/audio/out/ao_lavc.c index e72c6c903d0f4..0631d54aea951 100644 --- a/audio/out/ao_lavc.c +++ b/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"; diff --git a/audio/out/ao_openal.c b/audio/out/ao_openal.c index ccc73ba9f5429..1f9115a471c10 100644 --- a/audio/out/ao_openal.c +++ b/audio/out/ao_openal.c @@ -35,12 +35,12 @@ #include #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 diff --git a/audio/out/ao_oss.c b/audio/out/ao_oss.c index 08d80bf7fd96a..0e17bcb63257d 100644 --- a/audio/out/ao_oss.c +++ b/audio/out/ao_oss.c @@ -34,8 +34,8 @@ #include #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 diff --git a/audio/out/ao_pcm.c b/audio/out/ao_pcm.c index 2b6a89e78b91c..207b75fddd8e2 100644 --- a/audio/out/ao_pcm.c +++ b/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 diff --git a/audio/out/ao_portaudio.c b/audio/out/ao_portaudio.c index ea8d8f3e88af7..b80549398f20b 100644 --- a/audio/out/ao_portaudio.c +++ b/audio/out/ao_portaudio.c @@ -26,10 +26,10 @@ #include #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 { diff --git a/audio/out/ao_pulse.c b/audio/out/ao_pulse.c index 382a4d2dcc6cc..0a7d5347ba4ce 100644 --- a/audio/out/ao_pulse.c +++ b/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" diff --git a/audio/out/ao_rsound.c b/audio/out/ao_rsound.c index db89ad52c6047..5bfdbcef0f2c8 100644 --- a/audio/out/ao_rsound.c +++ b/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" diff --git a/audio/out/ao_sdl.c b/audio/out/ao_sdl.c index b5368066d8321..231b40681a141 100644 --- a/audio/out/ao_sdl.c +++ b/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 diff --git a/audio/out/ao_wasapi.c b/audio/out/ao_wasapi.c index 03a733ce33b48..d5860ae3ea3ad 100644 --- a/audio/out/ao_wasapi.c +++ b/audio/out/ao_wasapi.c @@ -28,11 +28,11 @@ #include #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 diff --git a/demux/codec_tags.c b/demux/codec_tags.c index cf7e0356bed8d..63564e7c7d72e 100644 --- a/demux/codec_tags.c +++ b/demux/codec_tags.c @@ -20,7 +20,7 @@ #include #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 diff --git a/demux/demux.c b/demux/demux.c index 873821f250c6e..3a8f8972d54f2 100644 --- a/demux/demux.c +++ b/demux/demux.c @@ -29,10 +29,10 @@ #include #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" diff --git a/demux/demux.h b/demux/demux.h index 4afd85f4a7853..9337b76100a00 100644 --- a/demux/demux.h +++ b/demux/demux.h @@ -25,8 +25,8 @@ #include #include -#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" diff --git a/demux/demux_cue.c b/demux/demux_cue.c index 4d2c03dcce297..7c94850899b8e 100644 --- a/demux/demux_cue.c +++ b/demux/demux_cue.c @@ -22,7 +22,7 @@ #include #include -#include "core/bstr.h" +#include "mpvcore/bstr.h" #include "demux.h" #include "stream/stream.h" diff --git a/demux/demux_lavf.c b/demux/demux_lavf.c index 1654562bd94de..9a148c4a1e4ff 100644 --- a/demux/demux_lavf.c +++ b/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) diff --git a/demux/demux_libass.c b/demux/demux_libass.c index fc30f1dce516b..d98cdbb5a47f9 100644 --- a/demux/demux_libass.c +++ b/demux/demux_libass.c @@ -21,9 +21,9 @@ #include #include -#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" diff --git a/demux/demux_mf.c b/demux/demux_mf.c index 7c4b83692d3ac..9c2f8fb19c25d 100644 --- a/demux/demux_mf.c +++ b/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" diff --git a/demux/demux_mkv.c b/demux/demux_mkv.c index cc84565a609c4..9fc1c6f0bbdec 100644 --- a/demux/demux_mkv.c +++ b/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}, diff --git a/demux/demux_mng.c b/demux/demux_mng.c index f6cb66302c3d2..1342e51469609 100644 --- a/demux/demux_mng.c +++ b/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" diff --git a/demux/demux_raw.c b/demux/demux_raw.c index 4b3e8844a4f06..532a2b5cce550 100644 --- a/demux/demux_raw.c +++ b/demux/demux_raw.c @@ -23,7 +23,7 @@ #include #include -#include "core/m_option.h" +#include "mpvcore/m_option.h" #include "stream/stream.h" #include "demux.h" diff --git a/demux/demux_subreader.c b/demux/demux_subreader.c index 26fdfcb971e34..1448b522762e4 100644 --- a/demux/demux_subreader.c +++ b/demux/demux_subreader.c @@ -32,9 +32,9 @@ #include #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" diff --git a/demux/ebml.c b/demux/ebml.c index 2314121f5ead9..06ef85b742fa1 100644 --- a/demux/ebml.c +++ b/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) diff --git a/demux/ebml.h b/demux/ebml.h index 3f8bad0f92a39..715e9ff85dcb4 100644 --- a/demux/ebml.h +++ b/demux/ebml.h @@ -24,7 +24,7 @@ #include #include "stream/stream.h" -#include "core/bstr.h" +#include "mpvcore/bstr.h" /* EBML version supported */ diff --git a/demux/mf.c b/demux/mf.c index 726bc8f394961..8682e846bf604 100644 --- a/demux/mf.c +++ b/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" diff --git a/mpvcore/asxparser.c b/mpvcore/asxparser.c index ec1531354774f..804e796f85d63 100644 --- a/mpvcore/asxparser.c +++ b/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; diff --git a/mpvcore/av_common.c b/mpvcore/av_common.c index a4dc525aa9cf4..ebf871c5448af 100644 --- a/mpvcore/av_common.c +++ b/mpvcore/av_common.c @@ -20,7 +20,7 @@ #include #include -#include "core/mp_talloc.h" +#include "mpvcore/mp_talloc.h" #include "demux/demux_packet.h" #include "av_common.h" #include "codecs.h" diff --git a/mpvcore/av_log.c b/mpvcore/av_log.c index 1331a1fb2678a..64e41554159ff 100644 --- a/mpvcore/av_log.c +++ b/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 #include diff --git a/mpvcore/bstr.c b/mpvcore/bstr.c index 16da0993ead95..adcc6575f329c 100644 --- a/mpvcore/bstr.c +++ b/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) { diff --git a/mpvcore/charset_conv.c b/mpvcore/charset_conv.c index 680c8f83f9f55..dc6f16d20d171 100644 --- a/mpvcore/charset_conv.c +++ b/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 diff --git a/mpvcore/charset_conv.h b/mpvcore/charset_conv.h index 00a2658da3a9f..ad10f010a0f59 100644 --- a/mpvcore/charset_conv.h +++ b/mpvcore/charset_conv.h @@ -2,7 +2,7 @@ #define MP_CHARSET_CONV_H #include -#include "core/bstr.h" +#include "mpvcore/bstr.h" enum { MP_ICONV_VERBOSE = 1, // print errors instead of failing silently diff --git a/mpvcore/codecs.c b/mpvcore/codecs.c index 943860a70b13d..23f5402fc61dc 100644 --- a/mpvcore/codecs.c +++ b/mpvcore/codecs.c @@ -16,9 +16,9 @@ */ #include -#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, diff --git a/mpvcore/command.c b/mpvcore/command.c index b7718e41b7b65..bc128953cedbb 100644 --- a/mpvcore/command.c +++ b/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); diff --git a/mpvcore/cpudetect.c b/mpvcore/cpudetect.c index 62cb03008dde4..d670de0f9805f 100644 --- a/mpvcore/cpudetect.c +++ b/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; diff --git a/mpvcore/encode_lavc.c b/mpvcore/encode_lavc.c index 75e57a24437bd..ce8d9a8e597ca 100644 --- a/mpvcore/encode_lavc.c +++ b/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" diff --git a/mpvcore/input/input.c b/mpvcore/input/input.c index ae1358a76d494..935ed62f8e280 100644 --- a/mpvcore/input/input.c +++ b/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) diff --git a/mpvcore/input/input.h b/mpvcore/input/input.h index 92e2a32c4f3b9..2c8441c7c0627 100644 --- a/mpvcore/input/input.h +++ b/mpvcore/input/input.h @@ -20,8 +20,8 @@ #define MPLAYER_INPUT_H #include -#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 { diff --git a/mpvcore/input/joystick.c b/mpvcore/input/joystick.c index e8330ffaeb2e5..2ab38f6311326 100644 --- a/mpvcore/input/joystick.c +++ b/mpvcore/input/joystick.c @@ -30,7 +30,7 @@ #include #include -#include "core/mp_msg.h" +#include "mpvcore/mp_msg.h" #include "keycodes.h" #ifndef JOY_AXIS_DELTA diff --git a/mpvcore/input/lirc.c b/mpvcore/input/lirc.c index 699168d239da8..059d548f95cf7 100644 --- a/mpvcore/input/lirc.c +++ b/mpvcore/input/lirc.c @@ -26,7 +26,7 @@ #include #include -#include "core/mp_msg.h" +#include "mpvcore/mp_msg.h" #include "input.h" #include "lirc.h" diff --git a/mpvcore/m_config.c b/mpvcore/m_config.c index f362b43836867..c94b568435342 100644 --- a/mpvcore/m_config.c +++ b/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. diff --git a/mpvcore/m_config.h b/mpvcore/m_config.h index c2f88dfe65bd9..996d73f26edfd 100644 --- a/mpvcore/m_config.h +++ b/mpvcore/m_config.h @@ -22,7 +22,7 @@ #include #include -#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 diff --git a/mpvcore/m_option.c b/mpvcore/m_option.c index 41916befeb49a..1e195bcece59a 100644 --- a/mpvcore/m_option.c +++ b/mpvcore/m_option.c @@ -36,10 +36,10 @@ #include #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) { diff --git a/mpvcore/m_option.h b/mpvcore/m_option.h index 89f3caa6526ee..d8ea643dcfe7e 100644 --- a/mpvcore/m_option.h +++ b/mpvcore/m_option.h @@ -24,7 +24,7 @@ #include #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. diff --git a/mpvcore/m_property.c b/mpvcore/m_property.c index f334b6fe1f454..6517d8abe9a63 100644 --- a/mpvcore/m_property.c +++ b/mpvcore/m_property.c @@ -30,10 +30,10 @@ #include #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", diff --git a/mpvcore/mp_common.c b/mpvcore/mp_common.c index 03e3e988fde17..3ea6e66531311 100644 --- a/mpvcore/mp_common.c +++ b/mpvcore/mp_common.c @@ -19,8 +19,8 @@ #include #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) { diff --git a/mpvcore/mp_common.h b/mpvcore/mp_common.h index 71e24604ec322..9a719ae8abdf9 100644 --- a/mpvcore/mp_common.h +++ b/mpvcore/mp_common.h @@ -24,7 +24,7 @@ #include #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) diff --git a/mpvcore/mp_core.h b/mpvcore/mp_core.h index 126c646a0baae..0ce37b8aa5e1c 100644 --- a/mpvcore/mp_core.h +++ b/mpvcore/mp_core.h @@ -21,7 +21,7 @@ #include -#include "core/options.h" +#include "mpvcore/options.h" #include "audio/mixer.h" #include "demux/demux.h" diff --git a/mpvcore/mp_msg.c b/mpvcore/mp_msg.c index ff611451c2ee4..3f073bf919ad6 100644 --- a/mpvcore/mp_msg.c +++ b/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 #endif -#include "core/mp_msg.h" +#include "mpvcore/mp_msg.h" bool mp_msg_stdout_in_use = 0; diff --git a/mpvcore/mp_msg.h b/mpvcore/mp_msg.h index 4685668f0149c..aa3d57a802322 100644 --- a/mpvcore/mp_msg.h +++ b/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); diff --git a/mpvcore/mp_ring.c b/mpvcore/mp_ring.c index bd94870710382..aa62c305be37b 100644 --- a/mpvcore/mp_ring.c +++ b/mpvcore/mp_ring.c @@ -21,8 +21,8 @@ #include #include #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; diff --git a/mpvcore/mplayer.c b/mpvcore/mplayer.c index d3872442ee8f6..cac24363f9ebc 100644 --- a/mpvcore/mplayer.c +++ b/mpvcore/mplayer.c @@ -63,26 +63,26 @@ #include -#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); diff --git a/mpvcore/options.c b/mpvcore/options.c index dcab2dc56444c..b66556d8bdc62 100644 --- a/mpvcore/options.c +++ b/mpvcore/options.c @@ -27,10 +27,10 @@ #include #include -#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" diff --git a/mpvcore/options.h b/mpvcore/options.h index c83ab7a73aad6..ff2b5954ffa9d 100644 --- a/mpvcore/options.h +++ b/mpvcore/options.h @@ -3,7 +3,7 @@ #include #include -#include "core/m_option.h" +#include "mpvcore/m_option.h" typedef struct mp_vo_opts { struct m_obj_settings *video_driver_list; diff --git a/mpvcore/parser-cfg.c b/mpvcore/parser-cfg.c index a69f4545d2888..763b1b1493ed9 100644 --- a/mpvcore/parser-cfg.c +++ b/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. diff --git a/mpvcore/parser-mpcmd.c b/mpvcore/parser-mpcmd.c index d716fc4d28880..9b9d175cf7c59 100644 --- a/mpvcore/parser-mpcmd.c +++ b/mpvcore/parser-mpcmd.c @@ -25,8 +25,8 @@ #include #include -#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" diff --git a/mpvcore/path.c b/mpvcore/path.c index 50350be18c45e..5d9b7841a4d1b 100644 --- a/mpvcore/path.c +++ b/mpvcore/path.c @@ -33,8 +33,8 @@ #include #include #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" diff --git a/mpvcore/path.h b/mpvcore/path.h index a38ad503eab36..9728dc7399951 100644 --- a/mpvcore/path.h +++ b/mpvcore/path.h @@ -22,7 +22,7 @@ #define MPLAYER_PATH_H #include -#include "core/bstr.h" +#include "mpvcore/bstr.h" // Search for the input filename in several paths. These include user and global diff --git a/mpvcore/playlist.c b/mpvcore/playlist.c index b016cebca6fed..77e114b1a5e7a 100644 --- a/mpvcore/playlist.c +++ b/mpvcore/playlist.c @@ -18,9 +18,9 @@ #include #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) { diff --git a/mpvcore/playlist.h b/mpvcore/playlist.h index f01d4b8dddd36..fcf04929ac42d 100644 --- a/mpvcore/playlist.h +++ b/mpvcore/playlist.h @@ -19,7 +19,7 @@ #define MPLAYER_PLAYLIST_H #include -#include "core/bstr.h" +#include "mpvcore/bstr.h" struct playlist_param { bstr name, value; diff --git a/mpvcore/playlist_parser.c b/mpvcore/playlist_parser.c index 59d5123be6869..4573e133ae4e9 100644 --- a/mpvcore/playlist_parser.c +++ b/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 diff --git a/mpvcore/resolve_quvi.c b/mpvcore/resolve_quvi.c index 5870335811c86..9e98f2a992ca3 100644 --- a/mpvcore/resolve_quvi.c +++ b/mpvcore/resolve_quvi.c @@ -19,8 +19,8 @@ #include #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) diff --git a/mpvcore/resolve_quvi9.c b/mpvcore/resolve_quvi9.c index f6e6e8b94f2ae..3fd2b3bd0f194 100644 --- a/mpvcore/resolve_quvi9.c +++ b/mpvcore/resolve_quvi9.c @@ -21,9 +21,9 @@ #include #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) diff --git a/mpvcore/screenshot.c b/mpvcore/screenshot.c index ea2fe7a3c9251..b7697e913bd48 100644 --- a/mpvcore/screenshot.c +++ b/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" diff --git a/mpvcore/timeline/tl_cue.c b/mpvcore/timeline/tl_cue.c index 3c4a9979826f1..f7e13ec6812bc 100644 --- a/mpvcore/timeline/tl_cue.c +++ b/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 diff --git a/mpvcore/timeline/tl_edl.c b/mpvcore/timeline/tl_edl.c index 4afb346daeb8f..4b8cf7ed175dc 100644 --- a/mpvcore/timeline/tl_edl.c +++ b/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" diff --git a/mpvcore/timeline/tl_matroska.c b/mpvcore/timeline/tl_matroska.c index cc6e62d429a61..17ad192d37756 100644 --- a/mpvcore/timeline/tl_matroska.c +++ b/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 { diff --git a/osdep/getch2-win.c b/osdep/getch2-win.c index 558876ff62971..c76f0b32cb041 100644 --- a/osdep/getch2-win.c +++ b/osdep/getch2-win.c @@ -28,8 +28,8 @@ #include #include #include -#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 d31bb97ab0d86..eeefa8c9e638e 100644 --- a/osdep/getch2.c +++ b/osdep/getch2.c @@ -46,10 +46,10 @@ #include -#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 a2718b1bf9d28..d04b2ccdea64d 100644 --- a/osdep/macosx_application.m +++ b/osdep/macosx_application.m @@ -19,9 +19,9 @@ #include #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 cef0fc550a9de..3a1f3b5b0be58 100644 --- a/osdep/macosx_bundle.m +++ b/osdep/macosx_bundle.m @@ -18,7 +18,7 @@ #import #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 1adb2e809bac0..409a210fb8e27 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 88a99e798db21..fe5376bd9cbb2 100644 --- a/osdep/macosx_events.m +++ b/osdep/macosx_events.m @@ -26,7 +26,7 @@ #import #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 81e9f6689fadd..76b381c6ef377 100644 --- a/osdep/priority.c +++ b/osdep/priority.c @@ -26,7 +26,7 @@ #include -#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 e5f751915ef55..72b96675c75a4 100644 --- a/osdep/timer-darwin.c +++ b/osdep/timer-darwin.c @@ -24,7 +24,7 @@ #include #include "config.h" -#include "core/mp_msg.h" +#include "mpvcore/mp_msg.h" #include "timer.h" static double timebase_ratio; diff --git a/stream/ai_alsa1x.c b/stream/ai_alsa1x.c index 12ffa133f2f19..82dec5669d975 100644 --- a/stream/ai_alsa1x.c +++ b/stream/ai_alsa1x.c @@ -25,7 +25,7 @@ #include #include "audio_in.h" -#include "core/mp_msg.h" +#include "mpvcore/mp_msg.h" int ai_alsa_setup(audio_in_t *ai) { diff --git a/stream/ai_oss.c b/stream/ai_oss.c index be553582882e9..52cdb71b8dacc 100644 --- a/stream/ai_oss.c +++ b/stream/ai_oss.c @@ -37,7 +37,7 @@ #endif #include "audio_in.h" -#include "core/mp_msg.h" +#include "mpvcore/mp_msg.h" int ai_oss_set_samplerate(audio_in_t *ai) { diff --git a/stream/audio_in.c b/stream/audio_in.c index 7f6a43fa2eb58..cc54e878004d3 100644 --- a/stream/audio_in.c +++ b/stream/audio_in.c @@ -23,7 +23,7 @@ #include "config.h" #include "audio_in.h" -#include "core/mp_msg.h" +#include "mpvcore/mp_msg.h" #include #include diff --git a/stream/cache.c b/stream/cache.c index a60b8dd9ef74b..9b7b3a17be7fa 100644 --- a/stream/cache.c +++ b/stream/cache.c @@ -51,10 +51,10 @@ #include "osdep/timer.h" -#include "core/mp_msg.h" +#include "mpvcore/mp_msg.h" #include "stream.h" -#include "core/mp_common.h" +#include "mpvcore/mp_common.h" // Note: (struct priv*)(cache->priv)->cache == cache diff --git a/stream/cdinfo.c b/stream/cdinfo.c index 82ff6d41697ad..cf4e984a6b0e2 100644 --- a/stream/cdinfo.c +++ b/stream/cdinfo.c @@ -25,7 +25,7 @@ #include #include #include -#include "core/mp_msg.h" +#include "mpvcore/mp_msg.h" #include "cdd.h" /******************************************************************************************************************* diff --git a/stream/cookies.c b/stream/cookies.c index 4181458405090..e0cfca7681305 100644 --- a/stream/cookies.c +++ b/stream/cookies.c @@ -33,9 +33,9 @@ #include "osdep/io.h" -#include "core/options.h" +#include "mpvcore/options.h" #include "cookies.h" -#include "core/mp_msg.h" +#include "mpvcore/mp_msg.h" #define MAX_COOKIES 20 diff --git a/stream/dvb_tune.c b/stream/dvb_tune.c index 8b24e88ede032..ded2e28681024 100644 --- a/stream/dvb_tune.c +++ b/stream/dvb_tune.c @@ -37,7 +37,7 @@ #include "config.h" #include "dvbin.h" #include "dvb_tune.h" -#include "core/mp_msg.h" +#include "mpvcore/mp_msg.h" diff --git a/stream/stream.c b/stream/stream.c index 4160e7267e84b..45bc7997a1dc5 100644 --- a/stream/stream.c +++ b/stream/stream.c @@ -37,14 +37,14 @@ #include "config.h" -#include "core/bstr.h" -#include "core/mp_msg.h" +#include "mpvcore/bstr.h" +#include "mpvcore/mp_msg.h" #include "osdep/timer.h" #include "stream.h" #include "demux/demux.h" -#include "core/m_option.h" -#include "core/m_config.h" +#include "mpvcore/m_option.h" +#include "mpvcore/m_config.h" // Includes additional padding in case sizes get rounded up by sector size. #define TOTAL_BUFFER_SIZE (STREAM_MAX_BUFFER_SIZE + STREAM_MAX_SECTOR_SIZE) diff --git a/stream/stream.h b/stream/stream.h index e928a258b640d..7a9b6ab909457 100644 --- a/stream/stream.h +++ b/stream/stream.h @@ -20,7 +20,7 @@ #define MPLAYER_STREAM_H #include "config.h" -#include "core/mp_msg.h" +#include "mpvcore/mp_msg.h" #include #include #include @@ -28,7 +28,7 @@ #include #include -#include "core/bstr.h" +#include "mpvcore/bstr.h" #ifndef O_BINARY #define O_BINARY 0 diff --git a/stream/stream_bluray.c b/stream/stream_bluray.c index 73b8ef61f8fd9..4864931cd5017 100644 --- a/stream/stream_bluray.c +++ b/stream/stream_bluray.c @@ -37,8 +37,8 @@ #include "config.h" #include "talloc.h" -#include "core/mp_msg.h" -#include "core/m_option.h" +#include "mpvcore/mp_msg.h" +#include "mpvcore/m_option.h" #include "stream.h" #include "demux/stheader.h" diff --git a/stream/stream_cdda.c b/stream/stream_cdda.c index ff659b2d02dd0..02ba28d54b9b3 100644 --- a/stream/stream_cdda.c +++ b/stream/stream_cdda.c @@ -42,13 +42,13 @@ #include "talloc.h" #include "stream.h" -#include "core/m_option.h" +#include "mpvcore/m_option.h" #include "libavutil/common.h" #include "compat/mpbswap.h" #include "cdd.h" -#include "core/mp_msg.h" +#include "mpvcore/mp_msg.h" extern char *cdrom_device; diff --git a/stream/stream_dvb.c b/stream/stream_dvb.c index 08f38cb23cf9a..d96aea69051df 100644 --- a/stream/stream_dvb.c +++ b/stream/stream_dvb.c @@ -42,8 +42,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA #include #include "stream.h" -#include "core/m_option.h" -#include "core/path.h" +#include "mpvcore/m_option.h" +#include "mpvcore/path.h" #include "libavutil/avstring.h" #include "dvbin.h" diff --git a/stream/stream_dvd.c b/stream/stream_dvd.c index c9473c4b676f0..0372e6c3c005d 100644 --- a/stream/stream_dvd.c +++ b/stream/stream_dvd.c @@ -27,7 +27,7 @@ #include "config.h" #include "talloc.h" -#include "core/mp_msg.h" +#include "mpvcore/mp_msg.h" #include #include @@ -38,7 +38,7 @@ #define FIRST_PCM_AID 160 #include "stream.h" -#include "core/m_option.h" +#include "mpvcore/m_option.h" #include "stream_dvd.h" #include "stream_dvd_common.h" diff --git a/stream/stream_dvd.h b/stream/stream_dvd.h index 97f2c83eeb6f7..509e84801a052 100644 --- a/stream/stream_dvd.h +++ b/stream/stream_dvd.h @@ -26,7 +26,7 @@ #include #include #include "stream.h" -#include "core/m_option.h" +#include "mpvcore/m_option.h" typedef struct { dvd_reader_t *dvd; diff --git a/stream/stream_dvd_common.c b/stream/stream_dvd_common.c index bc4c600c36a87..3416eea094f6e 100644 --- a/stream/stream_dvd_common.c +++ b/stream/stream_dvd_common.c @@ -39,7 +39,7 @@ #include #endif -#include "core/mp_msg.h" +#include "mpvcore/mp_msg.h" #include "stream_dvd_common.h" const char * const dvd_audio_stream_types[8] = { "ac3","unknown","mpeg1","mpeg2ext","lpcm","unknown","dts" }; diff --git a/stream/stream_file.c b/stream/stream_file.c index 1e9f372ba4b28..90615ac51f08c 100644 --- a/stream/stream_file.c +++ b/stream/stream_file.c @@ -29,9 +29,9 @@ #include "osdep/io.h" -#include "core/mp_msg.h" +#include "mpvcore/mp_msg.h" #include "stream.h" -#include "core/m_option.h" +#include "mpvcore/m_option.h" struct priv { int fd; diff --git a/stream/stream_lavf.c b/stream/stream_lavf.c index a55b594495e5b..0526d701f9061 100644 --- a/stream/stream_lavf.c +++ b/stream/stream_lavf.c @@ -21,15 +21,15 @@ #include #include "config.h" -#include "core/options.h" -#include "core/mp_msg.h" +#include "mpvcore/options.h" +#include "mpvcore/mp_msg.h" #include "stream.h" -#include "core/m_option.h" +#include "mpvcore/m_option.h" #include "cookies.h" -#include "core/bstr.h" -#include "core/mp_talloc.h" +#include "mpvcore/bstr.h" +#include "mpvcore/mp_talloc.h" static int open_f(stream_t *stream, int mode); static char **read_icy(stream_t *stream); diff --git a/stream/stream_pvr.c b/stream/stream_pvr.c index 60517e075475e..ded2751e117c4 100644 --- a/stream/stream_pvr.c +++ b/stream/stream_pvr.c @@ -43,7 +43,7 @@ #include #include -#include "core/mp_msg.h" +#include "mpvcore/mp_msg.h" #include "stream.h" #include "pvr.h" diff --git a/stream/stream_radio.c b/stream/stream_radio.c index 5fdf22ba9edf5..643b3049363ad 100644 --- a/stream/stream_radio.c +++ b/stream/stream_radio.c @@ -43,8 +43,8 @@ #include "stream.h" #include "demux/demux.h" -#include "core/m_option.h" -#include "core/mp_msg.h" +#include "mpvcore/m_option.h" +#include "mpvcore/mp_msg.h" #include "stream_radio.h" #include "libavutil/avstring.h" diff --git a/stream/stream_smb.c b/stream/stream_smb.c index a37dc659dd958..971c394051de0 100644 --- a/stream/stream_smb.c +++ b/stream/stream_smb.c @@ -23,9 +23,9 @@ #include #include -#include "core/mp_msg.h" +#include "mpvcore/mp_msg.h" #include "stream.h" -#include "core/m_option.h" +#include "mpvcore/m_option.h" struct priv { int fd; diff --git a/stream/stream_tv.c b/stream/stream_tv.c index 5a01d967e957b..ef6f49b4b65dd 100644 --- a/stream/stream_tv.c +++ b/stream/stream_tv.c @@ -27,7 +27,7 @@ #include #include "stream.h" -#include "core/m_option.h" +#include "mpvcore/m_option.h" #include "tv.h" #include diff --git a/stream/stream_vcd.c b/stream/stream_vcd.c index 453e69585e872..f1c36545bfc51 100644 --- a/stream/stream_vcd.c +++ b/stream/stream_vcd.c @@ -24,9 +24,9 @@ #include #endif -#include "core/mp_msg.h" +#include "mpvcore/mp_msg.h" #include "stream.h" -#include "core/m_option.h" +#include "mpvcore/m_option.h" #include #include diff --git a/stream/tv.c b/stream/tv.c index 79b70243fdce6..3a2064d247257 100644 --- a/stream/tv.c +++ b/stream/tv.c @@ -35,7 +35,7 @@ #include "config.h" -#include "core/mp_msg.h" +#include "mpvcore/mp_msg.h" #include "stream.h" #include "demux/demux.h" diff --git a/stream/tvi_v4l2.c b/stream/tvi_v4l2.c index e23ad1ea735a8..e9092ca4e725a 100644 --- a/stream/tvi_v4l2.c +++ b/stream/tvi_v4l2.c @@ -55,7 +55,7 @@ known issues: #include #include #endif -#include "core/mp_msg.h" +#include "mpvcore/mp_msg.h" #include "video/img_fourcc.h" #include "audio/format.h" #include "tv.h" diff --git a/stream/vcd_read.h b/stream/vcd_read.h index fc396c22dc5f1..9a1965e45917e 100644 --- a/stream/vcd_read.h +++ b/stream/vcd_read.h @@ -26,7 +26,7 @@ #include -#include "core/mp_msg.h" +#include "mpvcore/mp_msg.h" #include "stream.h" //=================== VideoCD ========================== diff --git a/stream/vcd_read_darwin.h b/stream/vcd_read_darwin.h index 2d8510617c6a8..795e0567b5e46 100644 --- a/stream/vcd_read_darwin.h +++ b/stream/vcd_read_darwin.h @@ -33,7 +33,7 @@ #include #include #include "compat/mpbswap.h" -#include "core/mp_msg.h" +#include "mpvcore/mp_msg.h" #include "stream.h" //=================== VideoCD ========================== diff --git a/stream/vcd_read_fbsd.h b/stream/vcd_read_fbsd.h index c58aae199204b..489c96950528f 100644 --- a/stream/vcd_read_fbsd.h +++ b/stream/vcd_read_fbsd.h @@ -41,7 +41,7 @@ #define TOCADDR(te) ((te).entry.addr) #define READ_TOC CDIOREADTOCENTRY #endif -#include "core/mp_msg.h" +#include "mpvcore/mp_msg.h" //=================== VideoCD ========================== #define CDROM_LEADOUT 0xAA diff --git a/stream/vcd_read_win32.h b/stream/vcd_read_win32.h index cf587316af622..10ca833574562 100644 --- a/stream/vcd_read_win32.h +++ b/stream/vcd_read_win32.h @@ -23,7 +23,7 @@ #include #include #include -#include "core/mp_msg.h" +#include "mpvcore/mp_msg.h" typedef struct mp_vcd_priv_st mp_vcd_priv_t; diff --git a/sub/ass_mp.c b/sub/ass_mp.c index 5e872230414fb..df4e3f314608b 100644 --- a/sub/ass_mp.c +++ b/sub/ass_mp.c @@ -30,12 +30,12 @@ #include #include "config.h" -#include "core/mp_msg.h" -#include "core/path.h" +#include "mpvcore/mp_msg.h" +#include "mpvcore/path.h" #include "ass_mp.h" #include "sub/sub.h" #include "stream/stream.h" -#include "core/options.h" +#include "mpvcore/options.h" // res_y should be track->PlayResY // It determines scaling of font sizes and more. diff --git a/sub/dec_sub.c b/sub/dec_sub.c index 4351cf60a0efb..8622d2c8724e5 100644 --- a/sub/dec_sub.c +++ b/sub/dec_sub.c @@ -27,9 +27,9 @@ #include "sd.h" #include "sub.h" #include "dec_sub.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" extern const struct sd_functions sd_ass; extern const struct sd_functions sd_lavc; diff --git a/sub/draw_bmp.c b/sub/draw_bmp.c index 4615458f1527a..3dc46fb827392 100644 --- a/sub/draw_bmp.c +++ b/sub/draw_bmp.c @@ -25,7 +25,7 @@ #include #include -#include "core/mp_common.h" +#include "mpvcore/mp_common.h" #include "sub/draw_bmp.h" #include "sub/sub.h" #include "sub/img_convert.h" diff --git a/sub/find_subfiles.c b/sub/find_subfiles.c index 3519e5c3860ff..10098f6bdadab 100644 --- a/sub/find_subfiles.c +++ b/sub/find_subfiles.c @@ -6,10 +6,10 @@ #include "osdep/io.h" -#include "core/mp_msg.h" -#include "core/options.h" -#include "core/path.h" -#include "core/mp_common.h" +#include "mpvcore/mp_msg.h" +#include "mpvcore/options.h" +#include "mpvcore/path.h" +#include "mpvcore/mp_common.h" #include "sub/find_subfiles.h" #include "sub/sub.h" diff --git a/sub/osd_libass.c b/sub/osd_libass.c index fc4592ef99ecf..eadb0e8da5c5a 100644 --- a/sub/osd_libass.c +++ b/sub/osd_libass.c @@ -25,8 +25,8 @@ #include "config.h" #include "talloc.h" -#include "core/mp_common.h" -#include "core/mp_msg.h" +#include "mpvcore/mp_common.h" +#include "mpvcore/mp_msg.h" #include "sub.h" static const char osd_font_pfb[] = @@ -34,7 +34,7 @@ static const char osd_font_pfb[] = ; #include "sub/ass_mp.h" -#include "core/options.h" +#include "mpvcore/options.h" // NOTE: \fs-5 to reduce the size of the symbols in relation to normal text. diff --git a/sub/sd_ass.c b/sub/sd_ass.c index 7395f1bea6a81..81e1df8dec915 100644 --- a/sub/sd_ass.c +++ b/sub/sd_ass.c @@ -25,9 +25,9 @@ #include "talloc.h" -#include "core/options.h" -#include "core/mp_common.h" -#include "core/mp_msg.h" +#include "mpvcore/options.h" +#include "mpvcore/mp_common.h" +#include "mpvcore/mp_msg.h" #include "video/csputils.h" #include "video/mp_image.h" #include "sub.h" diff --git a/sub/sd_lavc.c b/sub/sd_lavc.c index e39f537ba7e17..a906e72f10d10 100644 --- a/sub/sd_lavc.c +++ b/sub/sd_lavc.c @@ -22,9 +22,9 @@ #include #include "talloc.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 "demux/stheader.h" #include "sd.h" #include "dec_sub.h" diff --git a/sub/sd_lavc_conv.c b/sub/sd_lavc_conv.c index 4f24e207096c9..0c8160495c49c 100644 --- a/sub/sd_lavc_conv.c +++ b/sub/sd_lavc_conv.c @@ -25,9 +25,9 @@ #include "config.h" #include "talloc.h" -#include "core/mp_msg.h" -#include "core/av_common.h" -#include "core/bstr.h" +#include "mpvcore/mp_msg.h" +#include "mpvcore/av_common.h" +#include "mpvcore/bstr.h" #include "sd.h" struct sd_lavc_priv { diff --git a/sub/sd_lavf_srt.c b/sub/sd_lavf_srt.c index 0d34b489c7b22..3e2ebefab23d6 100644 --- a/sub/sd_lavf_srt.c +++ b/sub/sd_lavf_srt.c @@ -21,7 +21,7 @@ #include #include -#include "core/bstr.h" +#include "mpvcore/bstr.h" #include "sd.h" /* diff --git a/sub/sd_microdvd.c b/sub/sd_microdvd.c index 81c8ef92c851a..c0e9fa1d6152e 100644 --- a/sub/sd_microdvd.c +++ b/sub/sd_microdvd.c @@ -27,8 +27,8 @@ #include #include -#include "core/mp_msg.h" -#include "core/bstr.h" +#include "mpvcore/mp_msg.h" +#include "mpvcore/bstr.h" #include "sd.h" struct line { diff --git a/sub/sd_spu.c b/sub/sd_spu.c index c6aed81641253..52e2b728ede5d 100644 --- a/sub/sd_spu.c +++ b/sub/sd_spu.c @@ -19,7 +19,7 @@ #include #include "talloc.h" -#include "core/options.h" +#include "mpvcore/options.h" #include "demux/stheader.h" #include "sd.h" #include "sub.h" diff --git a/sub/sd_srt.c b/sub/sd_srt.c index b01c4dc3f8574..f9d1a88c9f1a4 100644 --- a/sub/sd_srt.c +++ b/sub/sd_srt.c @@ -27,8 +27,8 @@ #include #include -#include "core/mp_msg.h" -#include "core/bstr.h" +#include "mpvcore/mp_msg.h" +#include "mpvcore/bstr.h" #include "sd.h" struct line { diff --git a/sub/spudec.c b/sub/spudec.c index 07dbb3af07518..56d7ca1eae4c7 100644 --- a/sub/spudec.c +++ b/sub/spudec.c @@ -40,11 +40,11 @@ #include #include "config.h" -#include "core/mp_msg.h" +#include "mpvcore/mp_msg.h" #include "spudec.h" #include "sub.h" -#include "core/mp_common.h" +#include "mpvcore/mp_common.h" #include "video/csputils.h" typedef struct spu_packet_t packet_t; diff --git a/sub/sub.c b/sub/sub.c index f3feef3c884c8..a5ff9e25930c7 100644 --- a/sub/sub.c +++ b/sub/sub.c @@ -23,15 +23,15 @@ #include -#include "core/mp_common.h" +#include "mpvcore/mp_common.h" #include "stream/stream.h" #include "osdep/timer.h" #include "talloc.h" -#include "core/options.h" -#include "core/mp_msg.h" +#include "mpvcore/options.h" +#include "mpvcore/mp_msg.h" #include "sub.h" #include "dec_sub.h" #include "img_convert.h" diff --git a/sub/sub.h b/sub/sub.h index 4a636f0700ae1..3cb140565c466 100644 --- a/sub/sub.h +++ b/sub/sub.h @@ -23,7 +23,7 @@ #include #include -#include "core/m_option.h" +#include "mpvcore/m_option.h" // NOTE: VOs must support at least SUBBITMAP_RGBA. enum sub_bitmap_format { diff --git a/video/decode/dec_video.c b/video/decode/dec_video.c index 595ffb0e16806..22aa8f3e754ff 100644 --- a/video/decode/dec_video.c +++ b/video/decode/dec_video.c @@ -17,21 +17,21 @@ */ #include "config.h" -#include "core/options.h" +#include "mpvcore/options.h" #include #include #include #include -#include "core/mp_msg.h" +#include "mpvcore/mp_msg.h" #include "osdep/timer.h" #include "stream/stream.h" #include "demux/demux_packet.h" -#include "core/codecs.h" +#include "mpvcore/codecs.h" #include "video/out/vo.h" #include "video/csputils.h" diff --git a/video/decode/vd.c b/video/decode/vd.c index db038e3d96dc9..1518d7869585c 100644 --- a/video/decode/vd.c +++ b/video/decode/vd.c @@ -22,8 +22,8 @@ #include #include "config.h" -#include "core/mp_msg.h" -#include "core/options.h" +#include "mpvcore/mp_msg.h" +#include "mpvcore/options.h" #include "video/img_format.h" diff --git a/video/decode/vd_lavc.c b/video/decode/vd_lavc.c index 90fd29f48a577..0367c2afed14a 100644 --- a/video/decode/vd_lavc.c +++ b/video/decode/vd_lavc.c @@ -32,12 +32,12 @@ #include "talloc.h" #include "config.h" -#include "core/mp_msg.h" -#include "core/options.h" -#include "core/bstr.h" -#include "core/av_opts.h" -#include "core/av_common.h" -#include "core/codecs.h" +#include "mpvcore/mp_msg.h" +#include "mpvcore/options.h" +#include "mpvcore/bstr.h" +#include "mpvcore/av_opts.h" +#include "mpvcore/av_common.h" +#include "mpvcore/codecs.h" #include "compat/mpbswap.h" #include "video/fmt-conversion.h" @@ -57,7 +57,7 @@ #error palette too large, adapt video/mp_image.h:MP_PALETTE_SIZE #endif -#include "core/m_option.h" +#include "mpvcore/m_option.h" static void init_avctx(sh_video_t *sh, const char *decoder, struct hwdec *hwdec); static void uninit_avctx(sh_video_t *sh); diff --git a/video/decode/vdpau.c b/video/decode/vdpau.c index 512f9170a3dac..b259ae303ad5f 100644 --- a/video/decode/vdpau.c +++ b/video/decode/vdpau.c @@ -22,7 +22,7 @@ #include #include "lavc.h" -#include "core/mp_common.h" +#include "mpvcore/mp_common.h" #include "video/fmt-conversion.h" #include "video/vdpau.h" #include "video/decode/dec_video.h" diff --git a/video/filter/pullup.c b/video/filter/pullup.c index 71f34f068ffad..2421720d7042e 100644 --- a/video/filter/pullup.c +++ b/video/filter/pullup.c @@ -21,8 +21,8 @@ #include #include "config.h" #include "pullup.h" -#include "core/cpudetect.h" -#include "core/mp_common.h" +#include "mpvcore/cpudetect.h" +#include "mpvcore/mp_common.h" diff --git a/video/filter/vf.c b/video/filter/vf.c index 294c30644875f..f074c2059bca6 100644 --- a/video/filter/vf.c +++ b/video/filter/vf.c @@ -26,11 +26,11 @@ #include "config.h" -#include "core/mp_msg.h" -#include "core/m_option.h" -#include "core/m_config.h" +#include "mpvcore/mp_msg.h" +#include "mpvcore/m_option.h" +#include "mpvcore/m_config.h" -#include "core/options.h" +#include "mpvcore/options.h" #include "video/img_format.h" #include "video/mp_image.h" diff --git a/video/filter/vf.h b/video/filter/vf.h index c792049b3b3ac..29ce0518692a0 100644 --- a/video/filter/vf.h +++ b/video/filter/vf.h @@ -22,7 +22,7 @@ #include #include "video/mp_image.h" -#include "core/mp_common.h" +#include "mpvcore/mp_common.h" #include "video/vfcap.h" diff --git a/video/filter/vf_crop.c b/video/filter/vf_crop.c index c84dd22b845ed..cd4f07725181f 100644 --- a/video/filter/vf_crop.c +++ b/video/filter/vf_crop.c @@ -21,14 +21,14 @@ #include #include "config.h" -#include "core/mp_msg.h" -#include "core/options.h" +#include "mpvcore/mp_msg.h" +#include "mpvcore/options.h" #include "video/img_format.h" #include "video/mp_image.h" #include "vf.h" -#include "core/m_option.h" +#include "mpvcore/m_option.h" static const struct vf_priv_s { int crop_w,crop_h; diff --git a/video/filter/vf_delogo.c b/video/filter/vf_delogo.c index 6b716cab1439f..269464f605477 100644 --- a/video/filter/vf_delogo.c +++ b/video/filter/vf_delogo.c @@ -28,14 +28,14 @@ #include #include -#include "core/mp_msg.h" -#include "core/cpudetect.h" +#include "mpvcore/mp_msg.h" +#include "mpvcore/cpudetect.h" #include "video/img_format.h" #include "video/mp_image.h" #include "vf.h" #include "video/memcpy_pic.h" -#include "core/m_option.h" +#include "mpvcore/m_option.h" //===========================================================================// diff --git a/video/filter/vf_divtc.c b/video/filter/vf_divtc.c index b4718b355f6f1..56a66980276e1 100644 --- a/video/filter/vf_divtc.c +++ b/video/filter/vf_divtc.c @@ -23,8 +23,8 @@ #include #include "config.h" -#include "core/mp_msg.h" -#include "core/cpudetect.h" +#include "mpvcore/mp_msg.h" +#include "mpvcore/cpudetect.h" #include "libavutil/common.h" #include "compat/mpbswap.h" diff --git a/video/filter/vf_dlopen.c b/video/filter/vf_dlopen.c index f40762beabaf7..0a100a8b6b216 100644 --- a/video/filter/vf_dlopen.c +++ b/video/filter/vf_dlopen.c @@ -22,13 +22,13 @@ #include #include "config.h" -#include "core/mp_msg.h" +#include "mpvcore/mp_msg.h" #include "video/img_format.h" #include "video/mp_image.h" #include "vf.h" -#include "core/m_option.h" +#include "mpvcore/m_option.h" #include "vf_dlopen.h" diff --git a/video/filter/vf_down3dright.c b/video/filter/vf_down3dright.c index 895753bafcc3d..7cb75b14ddc42 100644 --- a/video/filter/vf_down3dright.c +++ b/video/filter/vf_down3dright.c @@ -22,8 +22,8 @@ #include #include "config.h" -#include "core/mp_msg.h" -#include "core/cpudetect.h" +#include "mpvcore/mp_msg.h" +#include "mpvcore/cpudetect.h" #include "video/img_format.h" #include "video/mp_image.h" diff --git a/video/filter/vf_dsize.c b/video/filter/vf_dsize.c index ef1d679906edf..a85457e7ef28f 100644 --- a/video/filter/vf_dsize.c +++ b/video/filter/vf_dsize.c @@ -22,7 +22,7 @@ #include #include "config.h" -#include "core/mp_msg.h" +#include "mpvcore/mp_msg.h" #include "video/img_format.h" #include "video/mp_image.h" diff --git a/video/filter/vf_eq.c b/video/filter/vf_eq.c index 76a8b2bc99e82..802b2f7048fa2 100644 --- a/video/filter/vf_eq.c +++ b/video/filter/vf_eq.c @@ -30,8 +30,8 @@ #include #include "config.h" -#include "core/mp_msg.h" -#include "core/cpudetect.h" +#include "mpvcore/mp_msg.h" +#include "mpvcore/cpudetect.h" #include "video/img_format.h" #include "video/mp_image.h" diff --git a/video/filter/vf_expand.c b/video/filter/vf_expand.c index 7b1b76ee97b15..11983f56ec267 100644 --- a/video/filter/vf_expand.c +++ b/video/filter/vf_expand.c @@ -24,8 +24,8 @@ #include #include "config.h" -#include "core/mp_msg.h" -#include "core/options.h" +#include "mpvcore/mp_msg.h" +#include "mpvcore/options.h" #include "video/img_format.h" #include "video/mp_image.h" @@ -33,7 +33,7 @@ #include "video/memcpy_pic.h" -#include "core/m_option.h" +#include "mpvcore/m_option.h" static struct vf_priv_s { // These four values are a backup of the values parsed from the command line. diff --git a/video/filter/vf_flip.c b/video/filter/vf_flip.c index a28633c7ef639..e9d2796724d1a 100644 --- a/video/filter/vf_flip.c +++ b/video/filter/vf_flip.c @@ -21,7 +21,7 @@ #include #include "config.h" -#include "core/mp_msg.h" +#include "mpvcore/mp_msg.h" #include "video/mp_image.h" #include "vf.h" diff --git a/video/filter/vf_format.c b/video/filter/vf_format.c index 639a564113c72..e5d4c117e7bd2 100644 --- a/video/filter/vf_format.c +++ b/video/filter/vf_format.c @@ -22,13 +22,13 @@ #include #include "config.h" -#include "core/mp_msg.h" +#include "mpvcore/mp_msg.h" #include "video/img_format.h" #include "video/mp_image.h" #include "vf.h" -#include "core/m_option.h" +#include "mpvcore/m_option.h" static struct vf_priv_s { int fmt; diff --git a/video/filter/vf_gradfun.c b/video/filter/vf_gradfun.c index 4217af0b4d29f..fa136269dd0cf 100644 --- a/video/filter/vf_gradfun.c +++ b/video/filter/vf_gradfun.c @@ -36,14 +36,14 @@ #include #include "config.h" -#include "core/cpudetect.h" +#include "mpvcore/cpudetect.h" #include "video/img_format.h" #include "video/mp_image.h" #include "vf.h" #include "video/memcpy_pic.h" #include "compat/x86_cpu.h" -#include "core/m_option.h" +#include "mpvcore/m_option.h" struct vf_priv_s { float cfg_thresh; diff --git a/video/filter/vf_hqdn3d.c b/video/filter/vf_hqdn3d.c index 835170765972a..ead6bd3466cff 100644 --- a/video/filter/vf_hqdn3d.c +++ b/video/filter/vf_hqdn3d.c @@ -24,7 +24,7 @@ #include #include -#include "core/mp_msg.h" +#include "mpvcore/mp_msg.h" #include "video/img_format.h" #include "video/mp_image.h" #include "vf.h" diff --git a/video/filter/vf_ilpack.c b/video/filter/vf_ilpack.c index f153a4b7d0fb6..d288ef07b6c57 100644 --- a/video/filter/vf_ilpack.c +++ b/video/filter/vf_ilpack.c @@ -22,8 +22,8 @@ #include #include "config.h" -#include "core/mp_msg.h" -#include "core/cpudetect.h" +#include "mpvcore/mp_msg.h" +#include "mpvcore/cpudetect.h" #include "video/img_format.h" #include "video/mp_image.h" diff --git a/video/filter/vf_lavfi.c b/video/filter/vf_lavfi.c index 9cb731ae18369..352350804bc08 100644 --- a/video/filter/vf_lavfi.c +++ b/video/filter/vf_lavfi.c @@ -35,9 +35,9 @@ #include #include -#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 "video/img_format.h" #include "video/mp_image.h" diff --git a/video/filter/vf_mirror.c b/video/filter/vf_mirror.c index 65e467a9cbf5a..c51c9617cbc0c 100644 --- a/video/filter/vf_mirror.c +++ b/video/filter/vf_mirror.c @@ -22,7 +22,7 @@ #include #include "config.h" -#include "core/mp_msg.h" +#include "mpvcore/mp_msg.h" #include "video/img_format.h" #include "video/mp_image.h" diff --git a/video/filter/vf_noformat.c b/video/filter/vf_noformat.c index cfdf91401abee..2a668c6d4470d 100644 --- a/video/filter/vf_noformat.c +++ b/video/filter/vf_noformat.c @@ -22,13 +22,13 @@ #include #include "config.h" -#include "core/mp_msg.h" +#include "mpvcore/mp_msg.h" #include "video/img_format.h" #include "video/mp_image.h" #include "vf.h" -#include "core/m_option.h" +#include "mpvcore/m_option.h" static struct vf_priv_s { int fmt; diff --git a/video/filter/vf_noise.c b/video/filter/vf_noise.c index 0af7da5c9acc2..9d880a6d345b4 100644 --- a/video/filter/vf_noise.c +++ b/video/filter/vf_noise.c @@ -25,8 +25,8 @@ #include #include "config.h" -#include "core/mp_msg.h" -#include "core/cpudetect.h" +#include "mpvcore/mp_msg.h" +#include "mpvcore/cpudetect.h" #include "video/img_format.h" #include "video/mp_image.h" diff --git a/video/filter/vf_phase.c b/video/filter/vf_phase.c index 5754b5f2c7398..deb2b0dbe5d82 100644 --- a/video/filter/vf_phase.c +++ b/video/filter/vf_phase.c @@ -22,7 +22,7 @@ #include #include "config.h" -#include "core/mp_msg.h" +#include "mpvcore/mp_msg.h" #include "video/img_format.h" #include "video/mp_image.h" diff --git a/video/filter/vf_pp.c b/video/filter/vf_pp.c index 742c26f95ca31..2112685c4bac5 100644 --- a/video/filter/vf_pp.c +++ b/video/filter/vf_pp.c @@ -24,8 +24,8 @@ #include #include "config.h" -#include "core/mp_msg.h" -#include "core/cpudetect.h" +#include "mpvcore/mp_msg.h" +#include "mpvcore/cpudetect.h" #include "video/img_format.h" #include "video/mp_image.h" diff --git a/video/filter/vf_pullup.c b/video/filter/vf_pullup.c index 62d0ff653c7a0..4d0fee6be6127 100644 --- a/video/filter/vf_pullup.c +++ b/video/filter/vf_pullup.c @@ -21,8 +21,8 @@ #include #include "config.h" -#include "core/mp_msg.h" -#include "core/cpudetect.h" +#include "mpvcore/mp_msg.h" +#include "mpvcore/cpudetect.h" #include "video/img_format.h" #include "video/mp_image.h" diff --git a/video/filter/vf_rotate.c b/video/filter/vf_rotate.c index 94132848fb408..05673d76cef0c 100644 --- a/video/filter/vf_rotate.c +++ b/video/filter/vf_rotate.c @@ -22,7 +22,7 @@ #include #include "config.h" -#include "core/mp_msg.h" +#include "mpvcore/mp_msg.h" #include "video/img_format.h" #include "video/mp_image.h" diff --git a/video/filter/vf_scale.c b/video/filter/vf_scale.c index 35c9e3cbae92a..618460965a4a7 100644 --- a/video/filter/vf_scale.c +++ b/video/filter/vf_scale.c @@ -25,8 +25,8 @@ #include #include "config.h" -#include "core/mp_msg.h" -#include "core/options.h" +#include "mpvcore/mp_msg.h" +#include "mpvcore/options.h" #include "video/img_format.h" #include "video/mp_image.h" @@ -39,7 +39,7 @@ #include "video/csputils.h" #include "video/out/vo.h" -#include "core/m_option.h" +#include "mpvcore/m_option.h" static struct vf_priv_s { int w, h; diff --git a/video/filter/vf_softpulldown.c b/video/filter/vf_softpulldown.c index 02a1158d5d9b1..9968c57a1f384 100644 --- a/video/filter/vf_softpulldown.c +++ b/video/filter/vf_softpulldown.c @@ -21,7 +21,7 @@ #include #include "config.h" -#include "core/mp_msg.h" +#include "mpvcore/mp_msg.h" #include "video/img_format.h" #include "video/mp_image.h" diff --git a/video/filter/vf_stereo3d.c b/video/filter/vf_stereo3d.c index 9d546388ff34e..07e8489b7a51c 100644 --- a/video/filter/vf_stereo3d.c +++ b/video/filter/vf_stereo3d.c @@ -24,13 +24,13 @@ #include #include "config.h" -#include "core/mp_msg.h" -#include "core/options.h" +#include "mpvcore/mp_msg.h" +#include "mpvcore/options.h" #include "video/img_format.h" #include "video/mp_image.h" #include "vf.h" -#include "core/m_option.h" +#include "mpvcore/m_option.h" #include "libavutil/common.h" #include "video/memcpy_pic.h" diff --git a/video/filter/vf_sub.c b/video/filter/vf_sub.c index 519f3c3eb7295..814b8a0fcae95 100644 --- a/video/filter/vf_sub.c +++ b/video/filter/vf_sub.c @@ -28,8 +28,8 @@ #include #include "config.h" -#include "core/mp_msg.h" -#include "core/options.h" +#include "mpvcore/mp_msg.h" +#include "mpvcore/options.h" #include "video/img_format.h" #include "video/mp_image.h" @@ -40,7 +40,7 @@ #include "video/sws_utils.h" #include "video/memcpy_pic.h" -#include "core/m_option.h" +#include "mpvcore/m_option.h" static const struct vf_priv_s { int opt_top_margin, opt_bottom_margin; diff --git a/video/filter/vf_swapuv.c b/video/filter/vf_swapuv.c index 10dc1da8581ec..64d8d61b7b7b4 100644 --- a/video/filter/vf_swapuv.c +++ b/video/filter/vf_swapuv.c @@ -24,7 +24,7 @@ #include #include -#include "core/mp_msg.h" +#include "mpvcore/mp_msg.h" #include "video/img_format.h" #include "video/mp_image.h" #include "vf.h" diff --git a/video/filter/vf_unsharp.c b/video/filter/vf_unsharp.c index dcca82df5b6b3..728def61b4d62 100644 --- a/video/filter/vf_unsharp.c +++ b/video/filter/vf_unsharp.c @@ -25,8 +25,8 @@ #include #include "config.h" -#include "core/mp_msg.h" -#include "core/cpudetect.h" +#include "mpvcore/mp_msg.h" +#include "mpvcore/cpudetect.h" #include "video/img_format.h" #include "video/mp_image.h" diff --git a/video/filter/vf_vo.c b/video/filter/vf_vo.c index 9edb393e23483..b3e7b7bd60070 100644 --- a/video/filter/vf_vo.c +++ b/video/filter/vf_vo.c @@ -22,8 +22,8 @@ #include #include "config.h" -#include "core/mp_msg.h" -#include "core/options.h" +#include "mpvcore/mp_msg.h" +#include "mpvcore/options.h" #include "video/mp_image.h" #include "vf.h" diff --git a/video/filter/vf_yadif.c b/video/filter/vf_yadif.c index 02b23c61c5940..29156986dbf09 100644 --- a/video/filter/vf_yadif.c +++ b/video/filter/vf_yadif.c @@ -25,10 +25,10 @@ #include #include "config.h" -#include "core/cpudetect.h" -#include "core/options.h" +#include "mpvcore/cpudetect.h" +#include "mpvcore/options.h" -#include "core/mp_msg.h" +#include "mpvcore/mp_msg.h" #include "video/img_format.h" #include "video/mp_image.h" #include "vf.h" diff --git a/video/fmt-conversion.c b/video/fmt-conversion.c index 500b4b1609135..509ff31535557 100644 --- a/video/fmt-conversion.c +++ b/video/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 #include "video/img_format.h" diff --git a/video/image_writer.c b/video/image_writer.c index 5224841b5d770..22192ade45cbe 100644 --- a/video/image_writer.c +++ b/video/image_writer.c @@ -40,7 +40,7 @@ #include "video/fmt-conversion.h" #include "video/sws_utils.h" -#include "core/m_option.h" +#include "mpvcore/m_option.h" const struct image_writer_opts image_writer_opts_defaults = { .format = "jpg", diff --git a/video/img_format.h b/video/img_format.h index 2438c231b865e..7261971e4390e 100644 --- a/video/img_format.h +++ b/video/img_format.h @@ -21,7 +21,7 @@ #include #include -#include "core/bstr.h" +#include "mpvcore/bstr.h" #if BYTE_ORDER == BIG_ENDIAN #define MP_SELECT_LE_BE(LE, BE) BE diff --git a/video/mp_image.h b/video/mp_image.h index 85595c570599a..7a70ec6a3512b 100644 --- a/video/mp_image.h +++ b/video/mp_image.h @@ -24,7 +24,7 @@ #include #include #include -#include "core/mp_msg.h" +#include "mpvcore/mp_msg.h" #include "csputils.h" #include "video/img_format.h" diff --git a/video/mp_image_pool.c b/video/mp_image_pool.c index a81a008aa1501..733f2059b4687 100644 --- a/video/mp_image_pool.c +++ b/video/mp_image_pool.c @@ -24,7 +24,7 @@ #include "talloc.h" -#include "core/mp_common.h" +#include "mpvcore/mp_common.h" #include "video/mp_image.h" #include "mp_image_pool.h" diff --git a/video/out/aspect.c b/video/out/aspect.c index 2697d97e97ed0..aa2e6e64d85a0 100644 --- a/video/out/aspect.c +++ b/video/out/aspect.c @@ -21,8 +21,8 @@ /* Stuff for correct aspect scaling. */ #include "aspect.h" #include "vo.h" -#include "core/mp_msg.h" -#include "core/options.h" +#include "mpvcore/mp_msg.h" +#include "mpvcore/options.h" #include "vo.h" diff --git a/video/out/bitmap_packer.c b/video/out/bitmap_packer.c index 4fd6594a3585b..ff76e703157f3 100644 --- a/video/out/bitmap_packer.c +++ b/video/out/bitmap_packer.c @@ -26,8 +26,8 @@ #include "talloc.h" #include "bitmap_packer.h" -#include "core/mp_msg.h" -#include "core/mp_common.h" +#include "mpvcore/mp_msg.h" +#include "mpvcore/mp_common.h" #include "sub/dec_sub.h" #include "video/memcpy_pic.h" diff --git a/video/out/cocoa_common.m b/video/out/cocoa_common.m index f50d8af2917a1..94673d5e941ac 100644 --- a/video/out/cocoa_common.m +++ b/video/out/cocoa_common.m @@ -27,14 +27,14 @@ #include "config.h" -#include "core/options.h" +#include "mpvcore/options.h" #include "vo.h" #include "aspect.h" -#include "core/input/input.h" +#include "mpvcore/input/input.h" #include "talloc.h" -#include "core/mp_msg.h" +#include "mpvcore/mp_msg.h" #include "osdep/macosx_application.h" #include "osdep/macosx_events.h" diff --git a/video/out/gl_common.c b/video/out/gl_common.c index 7c4bfd30563dd..589491f2d7cd0 100644 --- a/video/out/gl_common.c +++ b/video/out/gl_common.c @@ -42,8 +42,8 @@ #include #include "talloc.h" #include "gl_common.h" -#include "core/options.h" -#include "core/m_option.h" +#include "mpvcore/options.h" +#include "mpvcore/m_option.h" #include "sub/sub.h" #include "bitmap_packer.h" diff --git a/video/out/gl_common.h b/video/out/gl_common.h index e6ceabff74ed8..3e3bb8a8e86bb 100644 --- a/video/out/gl_common.h +++ b/video/out/gl_common.h @@ -29,8 +29,8 @@ #include #include "config.h" -#include "core/mp_msg.h" -#include "core/bstr.h" +#include "mpvcore/mp_msg.h" +#include "mpvcore/bstr.h" #include "vo.h" #include "video/csputils.h" diff --git a/video/out/gl_lcms.c b/video/out/gl_lcms.c index fdab119fb1745..6bda41cfe4a7e 100644 --- a/video/out/gl_lcms.c +++ b/video/out/gl_lcms.c @@ -27,10 +27,10 @@ #include "config.h" #include "stream/stream.h" -#include "core/mp_common.h" -#include "core/bstr.h" -#include "core/mp_msg.h" -#include "core/m_option.h" +#include "mpvcore/mp_common.h" +#include "mpvcore/bstr.h" +#include "mpvcore/mp_msg.h" +#include "mpvcore/m_option.h" #include "gl_video.h" #include "gl_lcms.h" diff --git a/video/out/gl_video.c b/video/out/gl_video.c index 0706d65b19515..6fb41e5814130 100644 --- a/video/out/gl_video.c +++ b/video/out/gl_video.c @@ -30,7 +30,7 @@ #include "gl_video.h" -#include "core/bstr.h" +#include "mpvcore/bstr.h" #include "gl_common.h" #include "gl_osd.h" #include "filter_kernels.h" diff --git a/video/out/vo.c b/video/out/vo.c index 3a0c1d060d9b3..32803a0a23c19 100644 --- a/video/out/vo.c +++ b/video/out/vo.c @@ -32,14 +32,14 @@ #include "config.h" #include "osdep/timer.h" -#include "core/options.h" -#include "core/bstr.h" +#include "mpvcore/options.h" +#include "mpvcore/bstr.h" #include "vo.h" #include "aspect.h" -#include "core/input/input.h" -#include "core/m_config.h" -#include "core/mp_msg.h" -#include "core/mpv_global.h" +#include "mpvcore/input/input.h" +#include "mpvcore/m_config.h" +#include "mpvcore/mp_msg.h" +#include "mpvcore/mpv_global.h" #include "video/mp_image.h" #include "video/vfcap.h" #include "sub/sub.h" diff --git a/video/out/vo.h b/video/out/vo.h index 1a57ad2a250b6..4052d11773b6f 100644 --- a/video/out/vo.h +++ b/video/out/vo.h @@ -27,8 +27,8 @@ #include #include "video/img_format.h" -#include "core/mp_common.h" -#include "core/options.h" +#include "mpvcore/mp_common.h" +#include "mpvcore/options.h" #define VO_EVENT_EXPOSE 1 #define VO_EVENT_RESIZE 2 diff --git a/video/out/vo_caca.c b/video/out/vo_caca.c index a14441e4f4ded..b217eb8f29926 100644 --- a/video/out/vo_caca.c +++ b/video/out/vo_caca.c @@ -40,10 +40,10 @@ #include "video/vfcap.h" #include "video/memcpy_pic.h" -#include "core/input/keycodes.h" -#include "core/input/input.h" -#include "core/mp_msg.h" -#include "core/input/input.h" +#include "mpvcore/input/keycodes.h" +#include "mpvcore/input/input.h" +#include "mpvcore/mp_msg.h" +#include "mpvcore/input/input.h" /* caca stuff */ static caca_canvas_t *canvas; diff --git a/video/out/vo_corevideo.c b/video/out/vo_corevideo.c index 77511b2b0b679..2bc5e9b2ddfeb 100644 --- a/video/out/vo_corevideo.c +++ b/video/out/vo_corevideo.c @@ -25,7 +25,7 @@ #include "talloc.h" #include "video/out/vo.h" #include "sub/sub.h" -#include "core/m_option.h" +#include "mpvcore/m_option.h" #include "video/csputils.h" #include "video/vfcap.h" diff --git a/video/out/vo_direct3d.c b/video/out/vo_direct3d.c index cc8b4d67f82a8..9a3e70b1cd39c 100644 --- a/video/out/vo_direct3d.c +++ b/video/out/vo_direct3d.c @@ -28,8 +28,8 @@ #include #include #include "config.h" -#include "core/options.h" -#include "core/m_option.h" +#include "mpvcore/options.h" +#include "mpvcore/m_option.h" #include "talloc.h" #include "vo.h" #include "video/vfcap.h" @@ -37,7 +37,7 @@ #include "video/mp_image.h" #include "video/img_format.h" #include "video/memcpy_pic.h" -#include "core/mp_msg.h" +#include "mpvcore/mp_msg.h" #include "w32_common.h" #include "libavutil/common.h" #include "sub/sub.h" diff --git a/video/out/vo_image.c b/video/out/vo_image.c index 03869146f74c3..248cddc78a219 100644 --- a/video/out/vo_image.c +++ b/video/out/vo_image.c @@ -25,11 +25,11 @@ #include #include "config.h" -#include "core/bstr.h" +#include "mpvcore/bstr.h" #include "osdep/io.h" -#include "core/path.h" +#include "mpvcore/path.h" #include "talloc.h" -#include "core/mp_msg.h" +#include "mpvcore/mp_msg.h" #include "video/out/vo.h" #include "video/csputils.h" #include "video/vfcap.h" @@ -38,7 +38,7 @@ #include "video/image_writer.h" #include "video/sws_utils.h" #include "sub/sub.h" -#include "core/m_option.h" +#include "mpvcore/m_option.h" struct priv { struct image_writer_opts *opts; diff --git a/video/out/vo_lavc.c b/video/out/vo_lavc.c index 7ee372f053e46..2a4a7d9969d81 100644 --- a/video/out/vo_lavc.c +++ b/video/out/vo_lavc.c @@ -23,15 +23,15 @@ #include #include #include "compat/libav.h" -#include "core/mp_common.h" -#include "core/options.h" +#include "mpvcore/mp_common.h" +#include "mpvcore/options.h" #include "video/fmt-conversion.h" #include "video/mp_image.h" #include "video/vfcap.h" #include "talloc.h" #include "vo.h" -#include "core/encode_lavc.h" +#include "mpvcore/encode_lavc.h" #include "sub/sub.h" #include "sub/dec_sub.h" diff --git a/video/out/vo_null.c b/video/out/vo_null.c index 88c355033f5d2..9927a0a53d27e 100644 --- a/video/out/vo_null.c +++ b/video/out/vo_null.c @@ -25,7 +25,7 @@ #include #include #include "config.h" -#include "core/mp_msg.h" +#include "mpvcore/mp_msg.h" #include "vo.h" #include "video/vfcap.h" #include "video/mp_image.h" diff --git a/video/out/vo_opengl.c b/video/out/vo_opengl.c index 10e7fdf527db2..a6950c8d111c3 100644 --- a/video/out/vo_opengl.c +++ b/video/out/vo_opengl.c @@ -33,10 +33,10 @@ #include "config.h" #include "talloc.h" -#include "core/mp_common.h" -#include "core/bstr.h" -#include "core/mp_msg.h" -#include "core/m_config.h" +#include "mpvcore/mp_common.h" +#include "mpvcore/bstr.h" +#include "mpvcore/mp_msg.h" +#include "mpvcore/m_config.h" #include "vo.h" #include "video/vfcap.h" #include "video/mp_image.h" diff --git a/video/out/vo_opengl_old.c b/video/out/vo_opengl_old.c index 1e8fba649588f..008dc2d2a6d2e 100644 --- a/video/out/vo_opengl_old.c +++ b/video/out/vo_opengl_old.c @@ -31,8 +31,8 @@ #include "config.h" #include "talloc.h" -#include "core/mp_msg.h" -#include "core/m_option.h" +#include "mpvcore/mp_msg.h" +#include "mpvcore/m_option.h" #include "vo.h" #include "video/vfcap.h" #include "video/mp_image.h" diff --git a/video/out/vo_sdl.c b/video/out/vo_sdl.c index 6b8b39398404b..64f1a856b9a7c 100644 --- a/video/out/vo_sdl.c +++ b/video/out/vo_sdl.c @@ -30,11 +30,11 @@ #include -#include "core/input/input.h" -#include "core/input/keycodes.h" -#include "core/input/input.h" -#include "core/mp_msg.h" -#include "core/options.h" +#include "mpvcore/input/input.h" +#include "mpvcore/input/keycodes.h" +#include "mpvcore/input/input.h" +#include "mpvcore/mp_msg.h" +#include "mpvcore/options.h" #include "osdep/timer.h" diff --git a/video/out/vo_vdpau.c b/video/out/vo_vdpau.c index 57d747dc4b21e..588a1ceac5dbe 100644 --- a/video/out/vo_vdpau.c +++ b/video/out/vo_vdpau.c @@ -37,14 +37,14 @@ #include "config.h" #include "video/vdpau.h" #include "video/decode/dec_video.h" -#include "core/mp_msg.h" -#include "core/options.h" +#include "mpvcore/mp_msg.h" +#include "mpvcore/options.h" #include "talloc.h" #include "vo.h" #include "x11_common.h" #include "video/csputils.h" #include "sub/sub.h" -#include "core/m_option.h" +#include "mpvcore/m_option.h" #include "video/vfcap.h" #include "video/mp_image.h" #include "osdep/timer.h" diff --git a/video/out/vo_x11.c b/video/out/vo_x11.c index e5def2fc9a8ad..e5b9053fe3700 100644 --- a/video/out/vo_x11.c +++ b/video/out/vo_x11.c @@ -49,8 +49,8 @@ #include "video/sws_utils.h" #include "video/fmt-conversion.h" -#include "core/mp_msg.h" -#include "core/options.h" +#include "mpvcore/mp_msg.h" +#include "mpvcore/options.h" #include "osdep/timer.h" extern int sws_flags; diff --git a/video/out/vo_xv.c b/video/out/vo_xv.c index b7e3687ef72e1..7cc7b8420de0d 100644 --- a/video/out/vo_xv.c +++ b/video/out/vo_xv.c @@ -41,9 +41,9 @@ #include #include -#include "core/options.h" +#include "mpvcore/options.h" #include "talloc.h" -#include "core/mp_msg.h" +#include "mpvcore/mp_msg.h" #include "vo.h" #include "video/vfcap.h" #include "video/mp_image.h" @@ -53,7 +53,7 @@ #include "sub/sub.h" #include "sub/draw_bmp.h" #include "video/csputils.h" -#include "core/m_option.h" +#include "mpvcore/m_option.h" #include "osdep/timer.h" static const vo_info_t info = { diff --git a/video/out/w32_common.c b/video/out/w32_common.c index 4515c9bda7cbf..b06f1e0aa3818 100644 --- a/video/out/w32_common.c +++ b/video/out/w32_common.c @@ -22,15 +22,15 @@ #include #include -#include "core/options.h" -#include "core/input/keycodes.h" -#include "core/input/input.h" -#include "core/mp_msg.h" -#include "core/mp_common.h" +#include "mpvcore/options.h" +#include "mpvcore/input/keycodes.h" +#include "mpvcore/input/input.h" +#include "mpvcore/mp_msg.h" +#include "mpvcore/mp_common.h" #include "vo.h" #include "aspect.h" #include "w32_common.h" -#include "core/input/input.h" +#include "mpvcore/input/input.h" #include "osdep/io.h" #include "talloc.h" diff --git a/video/out/wayland_common.c b/video/out/wayland_common.c index 9a35232183be7..fd74601df4ccd 100644 --- a/video/out/wayland_common.c +++ b/video/out/wayland_common.c @@ -33,9 +33,9 @@ #include #include "config.h" -#include "core/bstr.h" -#include "core/options.h" -#include "core/mp_msg.h" +#include "mpvcore/bstr.h" +#include "mpvcore/options.h" +#include "mpvcore/mp_msg.h" #include "libavutil/common.h" #include "talloc.h" @@ -45,8 +45,8 @@ #include "aspect.h" #include "osdep/timer.h" -#include "core/input/input.h" -#include "core/input/keycodes.h" +#include "mpvcore/input/input.h" +#include "mpvcore/input/keycodes.h" #define MOD_SHIFT_MASK 0x01 #define MOD_ALT_MASK 0x02 diff --git a/video/out/x11_common.c b/video/out/x11_common.c index 23ed91ba736d5..2e28b8c423da3 100644 --- a/video/out/x11_common.c +++ b/video/out/x11_common.c @@ -23,10 +23,10 @@ #include #include "config.h" -#include "core/bstr.h" -#include "core/options.h" -#include "core/mp_msg.h" -#include "core/input/input.h" +#include "mpvcore/bstr.h" +#include "mpvcore/options.h" +#include "mpvcore/mp_msg.h" +#include "mpvcore/input/input.h" #include "libavutil/common.h" #include "x11_common.h" #include "talloc.h" @@ -66,8 +66,8 @@ #include #endif -#include "core/input/input.h" -#include "core/input/keycodes.h" +#include "mpvcore/input/input.h" +#include "mpvcore/input/keycodes.h" #define vo_wm_LAYER 1 #define vo_wm_FULLSCREEN 2 diff --git a/video/sws_utils.c b/video/sws_utils.c index c63e4477625f7..2c2ac9a9b46a0 100644 --- a/video/sws_utils.c +++ b/video/sws_utils.c @@ -28,7 +28,7 @@ #include "video/img_format.h" #include "fmt-conversion.h" #include "csputils.h" -#include "core/mp_msg.h" +#include "mpvcore/mp_msg.h" //global sws_flags from the command line int sws_flags = 2; diff --git a/video/vdpau.h b/video/vdpau.h index bb8fe1cac8419..79fc842971227 100644 --- a/video/vdpau.h +++ b/video/vdpau.h @@ -7,7 +7,7 @@ #include #include -#include "core/mp_msg.h" +#include "mpvcore/mp_msg.h" #define CHECK_ST_ERROR(message) \ do { \