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 /video | |
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 'video')
-rw-r--r-- | video/out/gl_lcms.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/video/out/gl_lcms.c b/video/out/gl_lcms.c index 5da2411c4c..da6d520fa0 100644 --- a/video/out/gl_lcms.c +++ b/video/out/gl_lcms.c @@ -94,7 +94,7 @@ static struct bstr load_file(void *talloc_ctx, const char *filename, struct mpv_global *global) { struct bstr res = {0}; - char *fname = mp_get_user_path(NULL, filename); + char *fname = mp_get_user_path(NULL, global, filename); stream_t *s = stream_open(fname, global); if (s) { res = stream_read_complete(s, talloc_ctx, 1000000000); |