summaryrefslogtreecommitdiffstats
path: root/osdep
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 /osdep
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 'osdep')
-rw-r--r--osdep/path-macosx.m5
-rw-r--r--osdep/path.h5
2 files changed, 7 insertions, 3 deletions
diff --git a/osdep/path-macosx.m b/osdep/path-macosx.m
index d4c5020da1..543b248c14 100644
--- a/osdep/path-macosx.m
+++ b/osdep/path-macosx.m
@@ -20,11 +20,12 @@
#include "options/path.h"
#include "osdep/path.h"
-char *mp_get_macosx_bundled_path(const char *file)
+char *mp_get_macosx_bundled_path(void *talloc_ctx, struct mpv_global *global,
+ const char *filename)
{
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
NSString *path = [[NSBundle mainBundle] resourcePath];
- char *rv = mp_path_join(NULL, bstr0([path UTF8String]), bstr0(file));
+ char *rv = mp_path_join(talloc_ctx, bstr0([path UTF8String]), bstr0(file));
[pool release];
return rv;
}
diff --git a/osdep/path.h b/osdep/path.h
index 6ad4ebad8a..91afbce604 100644
--- a/osdep/path.h
+++ b/osdep/path.h
@@ -1,9 +1,12 @@
#ifndef OSDEP_PATH_H
#define OSDEP_PATH_H
+struct mpv_global;
+
char *mp_get_win_config_path(const char *filename);
// Returns absolute path of a resource file in a Mac OS X application bundle.
-char *mp_get_macosx_bundled_path(const char *filename);
+char *mp_get_macosx_bundled_path(void *talloc_ctx, struct mpv_global *global,
+ const char *filename);
#endif