summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-12-17 00:53:22 +0100
committerwm4 <wm4@nowhere>2013-12-17 00:53:22 +0100
commite44911142914783c9ec717f329bd9b6a8bb9b70e (patch)
tree92bb653f7d56553ffd3bb6e5a22ffc0db91142e8
parent7dc7b900c622235d595337c988a0c75280084b7c (diff)
downloadmpv-e44911142914783c9ec717f329bd9b6a8bb9b70e.tar.bz2
mpv-e44911142914783c9ec717f329bd9b6a8bb9b70e.tar.xz
Move mpvcore/player/ to player/
-rw-r--r--old-makefile50
-rw-r--r--player/audio.c (renamed from mpvcore/player/audio.c)0
-rw-r--r--player/command.c (renamed from mpvcore/player/command.c)0
-rw-r--r--player/command.h (renamed from mpvcore/player/command.h)0
-rw-r--r--player/configfiles.c (renamed from mpvcore/player/configfiles.c)0
-rw-r--r--player/dvdnav.c (renamed from mpvcore/player/dvdnav.c)0
-rw-r--r--player/loadfile.c (renamed from mpvcore/player/loadfile.c)0
-rw-r--r--player/lua/assdraw.lua (renamed from mpvcore/player/lua/assdraw.lua)0
-rw-r--r--player/lua/defaults.lua (renamed from mpvcore/player/lua/defaults.lua)0
-rw-r--r--player/lua/osc.lua (renamed from mpvcore/player/lua/osc.lua)0
-rw-r--r--player/main.c (renamed from mpvcore/player/main.c)0
-rw-r--r--player/misc.c (renamed from mpvcore/player/misc.c)0
-rw-r--r--player/mp_core.h (renamed from mpvcore/player/mp_core.h)0
-rw-r--r--player/mp_lua.c (renamed from mpvcore/player/mp_lua.c)8
-rw-r--r--player/mp_lua.h (renamed from mpvcore/player/mp_lua.h)0
-rw-r--r--player/osd.c (renamed from mpvcore/player/osd.c)0
-rw-r--r--player/playloop.c (renamed from mpvcore/player/playloop.c)0
-rw-r--r--player/screenshot.c (renamed from mpvcore/player/screenshot.c)0
-rw-r--r--player/screenshot.h (renamed from mpvcore/player/screenshot.h)0
-rw-r--r--player/sub.c (renamed from mpvcore/player/sub.c)0
-rw-r--r--player/timeline/tl_cue.c (renamed from mpvcore/player/timeline/tl_cue.c)2
-rw-r--r--player/timeline/tl_matroska.c (renamed from mpvcore/player/timeline/tl_matroska.c)2
-rw-r--r--player/timeline/tl_mpv_edl.c (renamed from mpvcore/player/timeline/tl_mpv_edl.c)2
-rw-r--r--player/video.c (renamed from mpvcore/player/video.c)0
-rw-r--r--wscript_build.py46
25 files changed, 56 insertions, 54 deletions
diff --git a/old-makefile b/old-makefile
index 31fa13dd43..8407ecaa6d 100644
--- a/old-makefile
+++ b/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
diff --git a/mpvcore/player/audio.c b/player/audio.c
index ec2f039531..ec2f039531 100644
--- a/mpvcore/player/audio.c
+++ b/player/audio.c
diff --git a/mpvcore/player/command.c b/player/command.c
index 10dfb4c261..10dfb4c261 100644
--- a/mpvcore/player/command.c
+++ b/player/command.c
diff --git a/mpvcore/player/command.h b/player/command.h
index d3469fc131..d3469fc131 100644
--- a/mpvcore/player/command.h
+++ b/player/command.h
diff --git a/mpvcore/player/configfiles.c b/player/configfiles.c
index ac95f6fdf4..ac95f6fdf4 100644
--- a/mpvcore/player/configfiles.c
+++ b/player/configfiles.c
diff --git a/mpvcore/player/dvdnav.c b/player/dvdnav.c
index 7fe1be3392..7fe1be3392 100644
--- a/mpvcore/player/dvdnav.c
+++ b/player/dvdnav.c
diff --git a/mpvcore/player/loadfile.c b/player/loadfile.c
index 08b245a0ff..08b245a0ff 100644
--- a/mpvcore/player/loadfile.c
+++ b/player/loadfile.c
diff --git a/mpvcore/player/lua/assdraw.lua b/player/lua/assdraw.lua
index fc3b727f57..fc3b727f57 100644
--- a/mpvcore/player/lua/assdraw.lua
+++ b/player/lua/assdraw.lua
diff --git a/mpvcore/player/lua/defaults.lua b/player/lua/defaults.lua
index d24cda9cbe..d24cda9cbe 100644
--- a/mpvcore/player/lua/defaults.lua
+++ b/player/lua/defaults.lua
diff --git a/mpvcore/player/lua/osc.lua b/player/lua/osc.lua
index d1dbf3e8b4..d1dbf3e8b4 100644
--- a/mpvcore/player/lua/osc.lua
+++ b/player/lua/osc.lua
diff --git a/mpvcore/player/main.c b/player/main.c
index 685ae16792..685ae16792 100644
--- a/mpvcore/player/main.c
+++ b/player/main.c
diff --git a/mpvcore/player/misc.c b/player/misc.c
index e54381d2e2..e54381d2e2 100644
--- a/mpvcore/player/misc.c
+++ b/player/misc.c
diff --git a/mpvcore/player/mp_core.h b/player/mp_core.h
index e1c7997907..e1c7997907 100644
--- a/mpvcore/player/mp_core.h
+++ b/player/mp_core.h
diff --git a/mpvcore/player/mp_lua.c b/player/mp_lua.c
index 03e21bf535..38dc8b2af5 100644
--- a/mpvcore/player/mp_lua.c
+++ b/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}
};
diff --git a/mpvcore/player/mp_lua.h b/player/mp_lua.h
index 050548e2d2..050548e2d2 100644
--- a/mpvcore/player/mp_lua.h
+++ b/player/mp_lua.h
diff --git a/mpvcore/player/osd.c b/player/osd.c
index 42409b555f..42409b555f 100644
--- a/mpvcore/player/osd.c
+++ b/player/osd.c
diff --git a/mpvcore/player/playloop.c b/player/playloop.c
index dbc87a7ec6..dbc87a7ec6 100644
--- a/mpvcore/player/playloop.c
+++ b/player/playloop.c
diff --git a/mpvcore/player/screenshot.c b/player/screenshot.c
index 7aaba5f05a..7aaba5f05a 100644
--- a/mpvcore/player/screenshot.c
+++ b/player/screenshot.c
diff --git a/mpvcore/player/screenshot.h b/player/screenshot.h
index 1b12ac9b73..1b12ac9b73 100644
--- a/mpvcore/player/screenshot.h
+++ b/player/screenshot.h
diff --git a/mpvcore/player/sub.c b/player/sub.c
index 26c8eebdb9..26c8eebdb9 100644
--- a/mpvcore/player/sub.c
+++ b/player/sub.c
diff --git a/mpvcore/player/timeline/tl_cue.c b/player/timeline/tl_cue.c
index e68b3349a5..1a0a547dda 100644
--- a/mpvcore/player/timeline/tl_cue.c
+++ b/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"
diff --git a/mpvcore/player/timeline/tl_matroska.c b/player/timeline/tl_matroska.c
index fa0e315fc5..c7cc09f2b5 100644
--- a/mpvcore/player/timeline/tl_matroska.c
+++ b/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"
diff --git a/mpvcore/player/timeline/tl_mpv_edl.c b/player/timeline/tl_mpv_edl.c
index fc0b6ebeeb..321a855f47 100644
--- a/mpvcore/player/timeline/tl_mpv_edl.c
+++ b/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"
diff --git a/mpvcore/player/video.c b/player/video.c
index e98055d2a9..e98055d2a9 100644
--- a/mpvcore/player/video.c
+++ b/player/video.c
diff --git a/wscript_build.py b/wscript_build.py
index a5f92b1f9f..538dd7a8cc 100644
--- a/wscript_build.py
+++ b/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" ),