RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-12-11 17:37:23 +00:00
Code Issues Releases Wiki Activity
b12a287227
mpv/osdep/path-macosx.m

32 lines
1.1 KiB
Mathematica
Raw Normal View History

path: add mp_find_config_file and reorganize some of the code Add `mp_find_config_file` to search different known paths and use that in ass_mp to look for the fontconfig configuration file. Some incidental changes spawned by this feature where: * Buffer allocation for the strings containing the paths is now performed with talloc. All of the allocations are done on a NULL context, but it still improves readability of the code. * Move the OSX function for lookup inside of a bundle: this code path was currently not used by the bundle generated with `make osxbundle`. The plan is to use it again in a future commit to get a fontconfig config file.
2012-12-09 14:05:21 +00:00
/*
* This file is part of mpv.
*
* mpv is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* mpv is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along
* with mpv; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#import <Foundation/Foundation.h>
Fix OSX build; remove all remaining mpvcore references
2013-12-17 02:35:43 +00:00
#include "options/path.h"
macosx: move bundle path stuff to path-macosx.m This makes the code uniform to how stuff was handled for Windows in 1cb55ceb.
2013-09-18 17:26:26 +00:00
#include "osdep/path.h"
path: add mp_find_config_file and reorganize some of the code Add `mp_find_config_file` to search different known paths and use that in ass_mp to look for the fontconfig configuration file. Some incidental changes spawned by this feature where: * Buffer allocation for the strings containing the paths is now performed with talloc. All of the allocations are done on a NULL context, but it still improves readability of the code. * Move the OSX function for lookup inside of a bundle: this code path was currently not used by the bundle generated with `make osxbundle`. The plan is to use it again in a future commit to get a fontconfig config file.
2012-12-09 14:05:21 +00:00
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.
2014-06-26 17:32:53 +00:00
int mp_add_macosx_bundle_dir(struct mpv_global *global, char **dirs, int i)
path: add mp_find_config_file and reorganize some of the code Add `mp_find_config_file` to search different known paths and use that in ass_mp to look for the fontconfig configuration file. Some incidental changes spawned by this feature where: * Buffer allocation for the strings containing the paths is now performed with talloc. All of the allocations are done on a NULL context, but it still improves readability of the code. * Move the OSX function for lookup inside of a bundle: this code path was currently not used by the bundle generated with `make osxbundle`. The plan is to use it again in a future commit to get a fontconfig config file.
2012-12-09 14:05:21 +00:00
{
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.
2014-06-26 17:32:53 +00:00
void *talloc_ctx = dirs;
macosx: move bundle path stuff to path-macosx.m This makes the code uniform to how stuff was handled for Windows in 1cb55ceb.
2013-09-18 17:26:26 +00:00
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
NSString *path = [[NSBundle mainBundle] resourcePath];
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.
2014-06-26 17:32:53 +00:00
dirs[i++] = talloc_strdup(talloc_ctx, [path UTF8String]);
macosx: move bundle path stuff to path-macosx.m This makes the code uniform to how stuff was handled for Windows in 1cb55ceb.
2013-09-18 17:26:26 +00:00
[pool release];
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.
2014-06-26 17:32:53 +00:00
return i;
path: add mp_find_config_file and reorganize some of the code Add `mp_find_config_file` to search different known paths and use that in ass_mp to look for the fontconfig configuration file. Some incidental changes spawned by this feature where: * Buffer allocation for the strings containing the paths is now performed with talloc. All of the allocations are done on a NULL context, but it still improves readability of the code. * Move the OSX function for lookup inside of a bundle: this code path was currently not used by the bundle generated with `make osxbundle`. The plan is to use it again in a future commit to get a fontconfig config file.
2012-12-09 14:05:21 +00:00
}
Reference in New Issue Copy Permalink