diff options
Diffstat (limited to 'osdep')
-rw-r--r-- | osdep/path-macosx.m | 5 | ||||
-rw-r--r-- | osdep/path.h | 5 |
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 |