summaryrefslogtreecommitdiffstats
path: root/osdep/path-macosx.m
diff options
context:
space:
mode:
authorKenneth Zhou <knthzh@gmail.com>2014-06-18 19:55:40 -0400
committerwm4 <wm4@nowhere>2014-06-26 19:37:25 +0200
commitcb250d490c14872f03bb0320179e48d05fe2539d (patch)
treedd27e22fcbb6e306175d041eb2b2c714b7079645 /osdep/path-macosx.m
parent8bb7d427e2180067f13f8dc5c5105029e9e00be7 (diff)
downloadmpv-cb250d490c14872f03bb0320179e48d05fe2539d.tar.bz2
mpv-cb250d490c14872f03bb0320179e48d05fe2539d.tar.xz
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 <wm4@nowhere>
Diffstat (limited to 'osdep/path-macosx.m')
-rw-r--r--osdep/path-macosx.m5
1 files changed, 2 insertions, 3 deletions
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;
}