diff options
-rw-r--r-- | .gitignore | 2 | ||||
-rw-r--r-- | Makefile | 32 | ||||
-rw-r--r-- | mpvcore/options.c | 2 | ||||
-rw-r--r-- | mpvcore/player/command.c (renamed from mpvcore/command.c) | 18 | ||||
-rw-r--r-- | mpvcore/player/command.h (renamed from mpvcore/command.h) | 0 | ||||
-rw-r--r-- | mpvcore/player/lua/assdraw.lua (renamed from mpvcore/lua/assdraw.lua) | 0 | ||||
-rw-r--r-- | mpvcore/player/lua/defaults.lua (renamed from mpvcore/lua/defaults.lua) | 0 | ||||
-rw-r--r-- | mpvcore/player/lua/osc.lua (renamed from mpvcore/lua/osc.lua) | 0 | ||||
-rw-r--r-- | mpvcore/player/mp_core.h (renamed from mpvcore/mp_core.h) | 0 | ||||
-rw-r--r-- | mpvcore/player/mp_lua.c (renamed from mpvcore/mp_lua.c) | 20 | ||||
-rw-r--r-- | mpvcore/player/mp_lua.h (renamed from mpvcore/mp_lua.h) | 0 | ||||
-rw-r--r-- | mpvcore/player/mp_osd.h (renamed from mpvcore/mp_osd.h) | 0 | ||||
-rw-r--r-- | mpvcore/player/mplayer.c (renamed from mpvcore/mplayer.c) | 10 | ||||
-rw-r--r-- | mpvcore/player/screenshot.c (renamed from mpvcore/screenshot.c) | 8 | ||||
-rw-r--r-- | mpvcore/player/screenshot.h (renamed from mpvcore/screenshot.h) | 0 | ||||
-rw-r--r-- | mpvcore/player/timeline/tl_cue.c (renamed from mpvcore/timeline/tl_cue.c) | 2 | ||||
-rw-r--r-- | mpvcore/player/timeline/tl_edl.c (renamed from mpvcore/timeline/tl_edl.c) | 2 | ||||
-rw-r--r-- | mpvcore/player/timeline/tl_matroska.c (renamed from mpvcore/timeline/tl_matroska.c) | 2 |
18 files changed, 48 insertions, 50 deletions
diff --git a/.gitignore b/.gitignore index 07eab0dfbd..f4361056da 100644 --- a/.gitignore +++ b/.gitignore @@ -18,7 +18,7 @@ /demux/ebml_defs.c /demux/ebml_types.h /sub/osd_font.h -/mpvcore/lua/*.inc +/mpvcore/player/lua/*.inc /DOCS/man/*/mpv.1 /DOCS/man/*/mpv.aux /DOCS/man/*/mpv.log @@ -129,7 +129,7 @@ SOURCES-$(WAYLAND) += video/out/vo_wayland.c video/out/wayland_comm SOURCES-$(VF_LAVFI) += video/filter/vf_lavfi.c SOURCES-$(AF_LAVFI) += audio/filter/af_lavfi.c -SOURCES-$(LUA) += mpvcore/mp_lua.c +SOURCES-$(LUA) += mpvcore/player/mp_lua.c ifeq ($(HAVE_AVUTIL_REFCOUNTING),no) SOURCES-yes += video/decode/lavc_dr1.c @@ -194,7 +194,6 @@ SOURCES = audio/audio.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 \ @@ -202,19 +201,20 @@ SOURCES = audio/audio.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 \ + mpvcore/player/command.c \ + mpvcore/player/mplayer.c \ + mpvcore/player/screenshot.c \ + mpvcore/player/timeline/tl_edl.c \ + mpvcore/player/timeline/tl_matroska.c \ + mpvcore/player/timeline/tl_cue.c \ osdep/io.c \ osdep/numcores.c \ osdep/timer.c \ @@ -408,16 +408,16 @@ sub/osd_libass.c: sub/osd_font.h sub/osd_font.h: TOOLS/file2string.pl sub/osd_font.otf ./$^ >$@ -mpvcore/mp_lua.c: mpvcore/lua/defaults.inc -mpvcore/lua/defaults.inc: TOOLS/file2string.pl mpvcore/lua/defaults.lua +mpvcore/player/mp_lua.c: mpvcore/player/lua/defaults.inc +mpvcore/player/lua/defaults.inc: TOOLS/file2string.pl mpvcore/player/lua/defaults.lua ./$^ >$@ -mpvcore/mp_lua.c: mpvcore/lua/assdraw.inc -mpvcore/lua/assdraw.inc: TOOLS/file2string.pl mpvcore/lua/assdraw.lua +mpvcore/player/mp_lua.c: mpvcore/player/lua/assdraw.inc +mpvcore/player/lua/assdraw.inc: TOOLS/file2string.pl mpvcore/player/lua/assdraw.lua ./$^ >$@ -mpvcore/mp_lua.c: mpvcore/lua/osc.inc -mpvcore/lua/osc.inc: TOOLS/file2string.pl mpvcore/lua/osc.lua +mpvcore/player/mp_lua.c: mpvcore/player/lua/osc.inc +mpvcore/player/lua/osc.inc: TOOLS/file2string.pl mpvcore/player/lua/osc.lua ./$^ >$@ # ./configure must be rerun if it changed @@ -518,9 +518,9 @@ clean: -$(RM) video/out/gl_video_shaders.h -$(RM) video/out/x11_icon.inc -$(RM) sub/osd_font.h - -$(RM) mpvcore/lua/defaults.inc - -$(RM) mpvcore/lua/assdraw.inc - -$(RM) mpvcore/lua/osc.inc + -$(RM) mpvcore/player/lua/defaults.inc + -$(RM) mpvcore/player/lua/assdraw.inc + -$(RM) mpvcore/player/lua/osc.inc distclean: clean -$(RM) config.log config.mak config.h TAGS tags diff --git a/mpvcore/options.c b/mpvcore/options.c index 619310235e..32d108d119 100644 --- a/mpvcore/options.c +++ b/mpvcore/options.c @@ -39,7 +39,7 @@ #include "audio/mixer.h" #include "audio/filter/af.h" #include "audio/decode/dec_audio.h" -#include "mp_core.h" +#include "player/mp_core.h" #include "osdep/priority.h" int network_bandwidth=0; diff --git a/mpvcore/command.c b/mpvcore/player/command.c index f20a6517b8..f1a2453ca9 100644 --- a/mpvcore/command.c +++ b/mpvcore/player/command.c @@ -30,27 +30,26 @@ #include "config.h" #include "talloc.h" #include "command.h" -#include "input/input.h" +#include "mpvcore/mp_common.h" +#include "mpvcore/input/input.h" #include "stream/stream.h" #include "demux/demux.h" #include "demux/stheader.h" -#include "resolve.h" -#include "playlist.h" -#include "playlist_parser.h" +#include "mpvcore/resolve.h" +#include "mpvcore/playlist.h" +#include "mpvcore/playlist_parser.h" #include "sub/sub.h" #include "sub/dec_sub.h" #include "mpvcore/m_option.h" -#include "m_property.h" -#include "m_config.h" +#include "mpvcore/m_property.h" +#include "mpvcore/m_config.h" #include "video/filter/vf.h" #include "video/decode/vd.h" #include "mp_osd.h" #include "video/out/vo.h" #include "video/csputils.h" -#include "playlist.h" #include "audio/mixer.h" #include "audio/out/ao.h" -#include "mpvcore/mp_common.h" #include "audio/filter/af.h" #include "video/decode/dec_video.h" #include "audio/decode/dec_audio.h" @@ -66,8 +65,7 @@ #include <sys/mman.h> #endif -#include "mpvcore/mp_core.h" - +#include "mp_core.h" #include "mp_lua.h" struct command_ctx { diff --git a/mpvcore/command.h b/mpvcore/player/command.h index d3469fc131..d3469fc131 100644 --- a/mpvcore/command.h +++ b/mpvcore/player/command.h diff --git a/mpvcore/lua/assdraw.lua b/mpvcore/player/lua/assdraw.lua index fc3b727f57..fc3b727f57 100644 --- a/mpvcore/lua/assdraw.lua +++ b/mpvcore/player/lua/assdraw.lua diff --git a/mpvcore/lua/defaults.lua b/mpvcore/player/lua/defaults.lua index d24cda9cbe..d24cda9cbe 100644 --- a/mpvcore/lua/defaults.lua +++ b/mpvcore/player/lua/defaults.lua diff --git a/mpvcore/lua/osc.lua b/mpvcore/player/lua/osc.lua index f105d10a9c..f105d10a9c 100644 --- a/mpvcore/lua/osc.lua +++ b/mpvcore/player/lua/osc.lua diff --git a/mpvcore/mp_core.h b/mpvcore/player/mp_core.h index 6d83be182a..6d83be182a 100644 --- a/mpvcore/mp_core.h +++ b/mpvcore/player/mp_core.h diff --git a/mpvcore/mp_lua.c b/mpvcore/player/mp_lua.c index 4741cb1f33..9339329f17 100644 --- a/mpvcore/mp_lua.c +++ b/mpvcore/player/mp_lua.c @@ -7,18 +7,18 @@ #include "talloc.h" -#include "mp_common.h" -#include "mp_lua.h" +#include "mpvcore/mp_common.h" +#include "mpvcore/m_property.h" +#include "mpvcore/mp_msg.h" +#include "mpvcore/m_option.h" +#include "mpvcore/input/input.h" +#include "mpvcore/path.h" +#include "mpvcore/bstr.h" +#include "osdep/timer.h" +#include "sub/sub.h" #include "mp_core.h" -#include "mp_msg.h" -#include "m_property.h" -#include "m_option.h" #include "command.h" -#include "input/input.h" -#include "sub/sub.h" -#include "osdep/timer.h" -#include "path.h" -#include "bstr.h" +#include "mp_lua.h" // List of builtin modules and their contents as strings. // All these are generated from mpvcore/lua/*.lua diff --git a/mpvcore/mp_lua.h b/mpvcore/player/mp_lua.h index 050548e2d2..050548e2d2 100644 --- a/mpvcore/mp_lua.h +++ b/mpvcore/player/mp_lua.h diff --git a/mpvcore/mp_osd.h b/mpvcore/player/mp_osd.h index 0b737f0c22..0b737f0c22 100644 --- a/mpvcore/mp_osd.h +++ b/mpvcore/player/mp_osd.h diff --git a/mpvcore/mplayer.c b/mpvcore/player/mplayer.c index 480149a17e..b92b38e050 100644 --- a/mpvcore/mplayer.c +++ b/mpvcore/player/mplayer.c @@ -65,7 +65,7 @@ #include "mpvcore/mpv_global.h" #include "mpvcore/mp_msg.h" -#include "av_log.h" +#include "mpvcore/av_log.h" #include "mpvcore/m_option.h" @@ -77,9 +77,9 @@ #include "sub/dec_sub.h" #include "sub/sd.h" -#include "mpvcore/mp_osd.h" +#include "mp_osd.h" #include "video/out/vo.h" -#include "mpvcore/screenshot.h" +#include "screenshot.h" #include "sub/sub.h" #include "mpvcore/cpudetect.h" @@ -146,7 +146,7 @@ #include "audio/mixer.h" -#include "mpvcore/mp_core.h" +#include "mp_core.h" #include "mpvcore/options.h" #include "mp_lua.h" @@ -198,7 +198,7 @@ static const char av_desync_help_text[] = _( // --- #include "mpvcore/mp_common.h" -#include "mpvcore/command.h" +#include "command.h" static void reset_subtitles(struct MPContext *mpctx); static void reinit_subs(struct MPContext *mpctx); diff --git a/mpvcore/screenshot.c b/mpvcore/player/screenshot.c index 181292474b..bafb3012fb 100644 --- a/mpvcore/screenshot.c +++ b/mpvcore/player/screenshot.c @@ -25,12 +25,12 @@ #include "osdep/io.h" #include "talloc.h" -#include "mpvcore/screenshot.h" -#include "mpvcore/mp_core.h" -#include "mpvcore/command.h" +#include "screenshot.h" +#include "mp_core.h" +#include "command.h" #include "mpvcore/bstr.h" #include "mpvcore/mp_msg.h" -#include "mpvcore/mp_osd.h" +#include "mp_osd.h" #include "mpvcore/path.h" #include "video/mp_image.h" #include "video/decode/dec_video.h" diff --git a/mpvcore/screenshot.h b/mpvcore/player/screenshot.h index 1b12ac9b73..1b12ac9b73 100644 --- a/mpvcore/screenshot.h +++ b/mpvcore/player/screenshot.h diff --git a/mpvcore/timeline/tl_cue.c b/mpvcore/player/timeline/tl_cue.c index 634a6de5f4..e68b3349a5 100644 --- a/mpvcore/timeline/tl_cue.c +++ b/mpvcore/player/timeline/tl_cue.c @@ -24,7 +24,7 @@ #include "talloc.h" -#include "mpvcore/mp_core.h" +#include "mpvcore/player/mp_core.h" #include "mpvcore/mp_msg.h" #include "demux/demux.h" #include "mpvcore/path.h" diff --git a/mpvcore/timeline/tl_edl.c b/mpvcore/player/timeline/tl_edl.c index 6fdcd6685c..69e2402149 100644 --- a/mpvcore/timeline/tl_edl.c +++ b/mpvcore/player/timeline/tl_edl.c @@ -23,7 +23,7 @@ #include "talloc.h" -#include "mpvcore/mp_core.h" +#include "mpvcore/player/mp_core.h" #include "mpvcore/mp_msg.h" #include "demux/demux.h" #include "mpvcore/path.h" diff --git a/mpvcore/timeline/tl_matroska.c b/mpvcore/player/timeline/tl_matroska.c index 55ef9cf825..5a96cfe5f1 100644 --- a/mpvcore/timeline/tl_matroska.c +++ b/mpvcore/player/timeline/tl_matroska.c @@ -30,7 +30,7 @@ #include "talloc.h" -#include "mpvcore/mp_core.h" +#include "mpvcore/player/mp_core.h" #include "mpvcore/mp_msg.h" #include "demux/demux.h" #include "mpvcore/path.h" |