summaryrefslogtreecommitdiffstats
path: root/player/lua.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2015-05-09 15:04:05 +0200
committerwm4 <wm4@nowhere>2015-05-09 15:04:05 +0200
commit40997b8ae5b4065b3e71d4369eaba14c991e5027 (patch)
tree365a13f36387573b812475f652c42aeae562108b /player/lua.c
parent2263f37dfb9faabfae9cbaf0c438ef35d1b764e2 (diff)
downloadmpv-40997b8ae5b4065b3e71d4369eaba14c991e5027.tar.bz2
mpv-40997b8ae5b4065b3e71d4369eaba14c991e5027.tar.xz
lua: remove deprecated "lua" sub directories
The compatibility code and the deprecation warning were at least in releases 0.8 and 0.9 - time to get rid of them.
Diffstat (limited to 'player/lua.c')
-rw-r--r--player/lua.c14
1 files changed, 4 insertions, 10 deletions
diff --git a/player/lua.c b/player/lua.c
index 4ef772fd84..8cfcd059a4 100644
--- a/player/lua.c
+++ b/player/lua.c
@@ -277,16 +277,10 @@ static void set_path(lua_State *L)
const char *path = lua_tostring(L, -1);
char *newpath = talloc_strdup(tmp, path ? path : "");
- char *dirs[] = {"scripts", "lua", NULL};
- for (int s = 0; dirs[s]; s++) {
- char **luadir = mp_find_all_config_files(tmp, get_mpctx(L)->global,
- dirs[s]);
- for (int i = 0; luadir && luadir[i]; i++) {
- // No need to display a warning for lua files in the deprecated
- // 'lua' dirs since scripting.c already warned on them
- newpath = talloc_asprintf_append(newpath, ";%s",
- mp_path_join(tmp, bstr0(luadir[i]), bstr0("?.lua")));
- }
+ char **luadir = mp_find_all_config_files(tmp, get_mpctx(L)->global, "scripts");
+ for (int i = 0; luadir && luadir[i]; i++) {
+ newpath = talloc_asprintf_append(newpath, ";%s",
+ mp_path_join(tmp, bstr0(luadir[i]), bstr0("?.lua")));
}
lua_pushstring(L, newpath); // package path newpath