summaryrefslogtreecommitdiffstats
path: root/player/screenshot.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-12-21 20:45:19 +0100
committerwm4 <wm4@nowhere>2013-12-21 21:43:17 +0100
commitad2199128da4a689be374e92aab57ac2c9fa76b9 (patch)
treee59647846141017a5ef1da3a3b0961b95cfbc5e6 /player/screenshot.c
parent232b8de095b0ad493f7aa83e900e861bcb11f52a (diff)
downloadmpv-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/screenshot.c')
-rw-r--r--player/screenshot.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/player/screenshot.c b/player/screenshot.c
index 70a85bc80b..7336c64e97 100644
--- a/player/screenshot.c
+++ b/player/screenshot.c
@@ -234,7 +234,7 @@ static char *create_fname(struct MPContext *mpctx, char *template,
res = talloc_strdup_append(res, template);
res = talloc_asprintf_append(res, ".%s", file_ext);
- char *fname = mp_get_user_path(NULL, res);
+ char *fname = mp_get_user_path(NULL, mpctx->global, res);
talloc_free(res);
return fname;