summaryrefslogtreecommitdiffstats
path: root/osdep/path-macosx.m
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-06-26 19:32:53 +0200
committerwm4 <wm4@nowhere>2014-06-26 19:56:45 +0200
commit3e631b9cb851a1c29880beaded78f2bbfa694976 (patch)
treee31e70674a3ce1955addaf08a10179fde04aecd3 /osdep/path-macosx.m
parent7f55a39646af1696444be2a04dc0d212db3f7013 (diff)
downloadmpv-3e631b9cb851a1c29880beaded78f2bbfa694976.tar.bz2
mpv-3e631b9cb851a1c29880beaded78f2bbfa694976.tar.xz
config: use the same signature for win32/OSX specific path functions
Seems like a good idea, even if it's basically unused (yet). Also document requirements on the functions (they're not obvious). OSX changes untested.
Diffstat (limited to 'osdep/path-macosx.m')
-rw-r--r--osdep/path-macosx.m7
1 files changed, 4 insertions, 3 deletions
diff --git a/osdep/path-macosx.m b/osdep/path-macosx.m
index 83fb113e8d..33086c3ea4 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_bundle_dir(void *talloc_ctx)
+int mp_add_macosx_bundle_dir(struct mpv_global *global, char **dirs, int i)
{
+ void *talloc_ctx = dirs;
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
NSString *path = [[NSBundle mainBundle] resourcePath];
- char *rv = talloc_strdup(talloc_ctx, [path UTF8String]);
+ dirs[i++] = talloc_strdup(talloc_ctx, [path UTF8String]);
[pool release];
- return rv;
+ return i;
}