RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

scripting: expand --script filename for C plugins

This commit is contained in:
Hoyon Mak 2017-06-09 18:03:39 +01:00 committed by wm4
parent d8a3b10f45
commit b2f756c80e
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
player/lua.c
View File

@ -190,10 +190,8 @@ static void add_functions(struct script_ctx *ctx);
static void load_file(lua_State *L, const char *fname)
{
struct script_ctx *ctx = get_ctx(L);
char *res_name = mp_get_user_path(NULL, ctx->mpctx->global, fname);
MP_VERBOSE(ctx, "loading file %s\n", res_name);
int r = luaL_loadfile(L, res_name);
talloc_free(res_name); // careful to not leak this on Lua errors
MP_VERBOSE(ctx, "loading file %s\n", fname);
int r = luaL_loadfile(L, fname);
if (r)
lua_error(L);
lua_call(L, 0, 0);

7
player/scripting.c
View File

@ -215,8 +215,11 @@ void mp_load_scripts(struct MPContext *mpctx)
// Load scripts from options
char **files = mpctx->opts->script_files;
for (int n = 0; files && files[n]; n++) {
if (files[n][0])
mp_load_script(mpctx, files[n]);
if (files[n][0]) {
char *path = mp_get_user_path(NULL, mpctx->global, files[n]);
mp_load_script(mpctx, path);
talloc_free(path);
}
}
if (!mpctx->opts->auto_load_scripts)
return;