diff options
| author | wm4 <wm4@nowhere> | 2013-12-21 20:45:19 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-12-21 21:43:17 +0100 |
| commit | ad2199128da4a689be374e92aab57ac2c9fa76b9 (patch) | |
| tree | e59647846141017a5ef1da3a3b0961b95cfbc5e6 /player/lua.c | |
| parent | 232b8de095b0ad493f7aa83e900e861bcb11f52a (diff) | |
| download | mpv-ad2199128da4a689be374e92aab57ac2c9fa76b9.tar.bz2 mpv-ad2199128da4a689be374e92aab57ac2c9fa76b9.tar.xz | |
path lookup functions: mp_msg conversions
There's a single mp_msg() in path.c, but all path lookup functions seem
to depend on it, so we get a rat-tail of stuff we have to change. This
is probably a good thing though, because we can have the path lookup
functions also access options, so we could allow overriding the default
config path, or ignore the MPV_HOME environment variable, and such
things.
Also take the chance to consistently add talloc_ctx parameters to the
path lookup functions.
Also, this change causes a big mess on configfiles.c. It's the same
issue: everything suddenly needs a (different) context argument. Make it
less wild by providing a mp_load_auto_profiles() function, which
isolates most of it to configfiles.c.
Diffstat (limited to 'player/lua.c')
| -rw-r--r-- | player/lua.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/player/lua.c b/player/lua.c index 87b13e3c09..a3e119a76a 100644 --- a/player/lua.c +++ b/player/lua.c @@ -297,8 +297,9 @@ static int script_log(lua_State *L) static int script_find_config_file(lua_State *L) { + struct MPContext *mpctx = get_mpctx(L); const char *s = luaL_checkstring(L, 1); - char *path = mp_find_user_config_file(s); + char *path = mp_find_user_config_file(NULL, mpctx->global, s); if (path) { lua_pushstring(L, path); } else { |