Move mpvcore/player/ to player/

old-makefile

@@ -133,7 +133,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/player/mp_lua.c
+SOURCES-$(LUA)                  += player/mp_lua.c
 
 ifeq ($(HAVE_AVUTIL_REFCOUNTING),no)
     SOURCES-yes                 += video/decode/lavc_dr1.c
@@ -214,25 +214,25 @@ SOURCES = audio/audio.c \
           mpvcore/playlist_parser.c \
           mpvcore/version.c \
           mpvcore/input/input.c \
-          mpvcore/player/audio.c \
-          mpvcore/player/configfiles.c \
-          mpvcore/player/command.c \
-          mpvcore/player/dvdnav.c \
-          mpvcore/player/loadfile.c \
-          mpvcore/player/main.c \
-          mpvcore/player/misc.c \
-          mpvcore/player/osd.c \
-          mpvcore/player/playloop.c \
-          mpvcore/player/screenshot.c \
-          mpvcore/player/sub.c \
-          mpvcore/player/video.c \
-          mpvcore/player/timeline/tl_matroska.c \
-          mpvcore/player/timeline/tl_mpv_edl.c \
-          mpvcore/player/timeline/tl_cue.c \
           osdep/io.c \
           osdep/numcores.c \
           osdep/timer.c \
           osdep/threads.c \
+          player/audio.c \
+          player/configfiles.c \
+          player/command.c \
+          player/dvdnav.c \
+          player/loadfile.c \
+          player/main.c \
+          player/misc.c \
+          player/osd.c \
+          player/playloop.c \
+          player/screenshot.c \
+          player/sub.c \
+          player/video.c \
+          player/timeline/tl_matroska.c \
+          player/timeline/tl_mpv_edl.c \
+          player/timeline/tl_cue.c \
           stream/cookies.c \
           stream/rar.c \
           stream/stream.c \
@@ -421,16 +421,16 @@ sub/osd_libass.c: sub/osd_font.h
 sub/osd_font.h: TOOLS/file2string.pl sub/osd_font.otf
 	./$^ >$@
 
-mpvcore/player/mp_lua.c: mpvcore/player/lua/defaults.inc
-mpvcore/player/lua/defaults.inc: TOOLS/file2string.pl mpvcore/player/lua/defaults.lua
+player/mp_lua.c: player/lua/defaults.inc
+player/lua/defaults.inc: TOOLS/file2string.pl player/lua/defaults.lua
 	./$^ >$@
 
-mpvcore/player/mp_lua.c: mpvcore/player/lua/assdraw.inc
-mpvcore/player/lua/assdraw.inc: TOOLS/file2string.pl mpvcore/player/lua/assdraw.lua
+player/mp_lua.c: player/lua/assdraw.inc
+player/lua/assdraw.inc: TOOLS/file2string.pl player/lua/assdraw.lua
 	./$^ >$@
 
-mpvcore/player/mp_lua.c: mpvcore/player/lua/osc.inc
-mpvcore/player/lua/osc.inc: TOOLS/file2string.pl mpvcore/player/lua/osc.lua
+player/mp_lua.c: player/lua/osc.inc
+player/lua/osc.inc: TOOLS/file2string.pl player/lua/osc.lua
 	./$^ >$@
 
 # ./configure must be rerun if it changed
@@ -531,9 +531,9 @@ clean:
 	-$(RM) video/out/gl_video_shaders.h
 	-$(RM) video/out/x11_icon.inc
 	-$(RM) sub/osd_font.h
-	-$(RM) mpvcore/player/lua/defaults.inc
-	-$(RM) mpvcore/player/lua/assdraw.inc
-	-$(RM) mpvcore/player/lua/osc.inc
+	-$(RM) player/lua/defaults.inc
+	-$(RM) player/lua/assdraw.inc
+	-$(RM) player/lua/osc.inc
 
 distclean: clean
 	-$(RM) config.log old_build/config.h old_build/config.mak Makefile config.mak config.h TAGS tags

player/mp_lua.c

@@ -21,16 +21,16 @@
 #include "mp_lua.h"
 
 // List of builtin modules and their contents as strings.
-// All these are generated from mpvcore/lua/*.lua
+// All these are generated from player/lua/*.lua
 static const char *builtin_lua_scripts[][2] = {
     {"mp.defaults",
-#   include "mpvcore/player/lua/defaults.inc"
+#   include "player/lua/defaults.inc"
     },
     {"mp.assdraw",
-#   include "mpvcore/player/lua/assdraw.inc"
+#   include "player/lua/assdraw.inc"
     },
     {"@osc",
-#   include "mpvcore/player/lua/osc.inc"
+#   include "player/lua/osc.inc"
     },
     {0}
 };

player/timeline/tl_cue.c

@@ -24,7 +24,7 @@
 
 #include "talloc.h"
 
-#include "mpvcore/player/mp_core.h"
+#include "player/mp_core.h"
 #include "mpvcore/mp_msg.h"
 #include "demux/demux.h"
 #include "mpvcore/path.h"

player/timeline/tl_matroska.c

@@ -30,7 +30,7 @@
 
 #include "talloc.h"
 
-#include "mpvcore/player/mp_core.h"
+#include "player/mp_core.h"
 #include "mpvcore/mp_msg.h"
 #include "demux/demux.h"
 #include "mpvcore/path.h"

player/timeline/tl_mpv_edl.c

@@ -24,7 +24,7 @@
 
 #include "talloc.h"
 
-#include "mpvcore/player/mp_core.h"
+#include "player/mp_core.h"
 #include "mpvcore/mp_msg.h"
 #include "demux/demux.h"
 #include "mpvcore/path.h"

wscript_build.py

@@ -71,16 +71,16 @@ def build(ctx):
         target = "sub/osd_font.h")
 
     ctx.file2string(
-        source = "mpvcore/player/lua/defaults.lua",
-        target = "mpvcore/player/lua/defaults.inc")
+        source = "player/lua/defaults.lua",
+        target = "player/lua/defaults.inc")
 
     ctx.file2string(
-        source = "mpvcore/player/lua/assdraw.lua",
-        target = "mpvcore/player/lua/assdraw.inc")
+        source = "player/lua/assdraw.lua",
+        target = "player/lua/assdraw.inc")
 
     ctx.file2string(
-        source = "mpvcore/player/lua/osc.lua",
-        target = "mpvcore/player/lua/osc.inc")
+        source = "player/lua/osc.lua",
+        target = "player/lua/osc.inc")
 
     ctx.matroska_header(
         source = "demux/ebml.c demux/demux_mkv.c",
@@ -166,22 +166,6 @@ def build(ctx):
         ( "mpvcore/input/input.c" ),
         ( "mpvcore/input/joystick.c",            "joystick" ),
         ( "mpvcore/input/lirc.c",                "lirc" ),
-        ( "mpvcore/player/audio.c" ),
-        ( "mpvcore/player/command.c" ),
-        ( "mpvcore/player/configfiles.c" ),
-        ( "mpvcore/player/dvdnav.c" ),
-        ( "mpvcore/player/loadfile.c" ),
-        ( "mpvcore/player/main.c" ),
-        ( "mpvcore/player/misc.c" ),
-        ( "mpvcore/player/mp_lua.c",             "lua" ),
-        ( "mpvcore/player/osd.c" ),
-        ( "mpvcore/player/playloop.c" ),
-        ( "mpvcore/player/screenshot.c" ),
-        ( "mpvcore/player/sub.c" ),
-        ( "mpvcore/player/timeline/tl_cue.c" ),
-        ( "mpvcore/player/timeline/tl_mpv_edl.c" ),
-        ( "mpvcore/player/timeline/tl_matroska.c" ),
-        ( "mpvcore/player/video.c" ),
         ( "mpvcore/asxparser.c" ),
         ( "mpvcore/av_common.c" ),
         ( "mpvcore/av_log.c" ),
@@ -222,6 +206,24 @@ def build(ctx):
         ( "demux/ebml.c" ),
         ( "demux/mf.c" ),
 
+        ## Player
+        ( "player/audio.c" ),
+        ( "player/command.c" ),
+        ( "player/configfiles.c" ),
+        ( "player/dvdnav.c" ),
+        ( "player/loadfile.c" ),
+        ( "player/main.c" ),
+        ( "player/misc.c" ),
+        ( "player/mp_lua.c",                     "lua" ),
+        ( "player/osd.c" ),
+        ( "player/playloop.c" ),
+        ( "player/screenshot.c" ),
+        ( "player/sub.c" ),
+        ( "player/timeline/tl_cue.c" ),
+        ( "player/timeline/tl_mpv_edl.c" ),
+        ( "player/timeline/tl_matroska.c" ),
+        ( "player/video.c" ),
+
         ## Streams
         ( "stream/ai_alsa1x.c",                  "alsa" ),
         ( "stream/ai_oss.c",                     "oss-audio" ),