From cb250d490c14872f03bb0320179e48d05fe2539d Mon Sep 17 00:00:00 2001 From: Kenneth Zhou Date: Wed, 18 Jun 2014 19:55:40 -0400 Subject: Basic xdg directory implementation Search $XDG_CONFIG_HOME and $XDG_CONFIG_DIRS for config files. This also negates the need to have separate user and global variants of mp_find_config_file() Closes #864, #109. Signed-off-by: wm4 --- osdep/path-macosx.m | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'osdep/path-macosx.m') diff --git a/osdep/path-macosx.m b/osdep/path-macosx.m index c5240f570e..83fb113e8d 100644 --- a/osdep/path-macosx.m +++ b/osdep/path-macosx.m @@ -20,12 +20,11 @@ #include "options/path.h" #include "osdep/path.h" -char *mp_get_macosx_bundled_path(void *talloc_ctx, struct mpv_global *global, - const char *file) +char *mp_get_macosx_bundle_dir(void *talloc_ctx) { NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; NSString *path = [[NSBundle mainBundle] resourcePath]; - char *rv = mp_path_join(talloc_ctx, bstr0([path UTF8String]), bstr0(file)); + char *rv = talloc_strdup(talloc_ctx, [path UTF8String]); [pool release]; return rv; } -- cgit v1.2.3