mirror of
https://github.com/mpv-player/mpv
synced 2024-12-26 17:12:36 +00:00
77021cf6fe
Apple slightly changed the App bundle mechanism which broke wrapper scripts that invoke the actual binary. it caused the bundle to always open a new instance of mpv instead of reusing the currently running one. just removing the wrapper script would lead to several regressions, so it was replaced with a symlink to the bundle binary. detection if mpv was started from the bundle was replaced by comparing the execution name of the binary, eg the name of the symlink "mpv-bundle". additionally, because we load a standard config from the Resources folder of the bundle again, we prevent that config from being loaded if mpv wasn't started via the bundle. the psn argument has to be removed manually again. the ability of loading your standard shell environment has been removed with the wrapper. a substitution will be added with another commit. as a side effect this fixes an issues when zsh was used with common NodeJS configuration scripts. Fixes #4926 #4866
35 lines
1.3 KiB
Objective-C
35 lines
1.3 KiB
Objective-C
/*
|
|
* This file is part of mpv.
|
|
*
|
|
* mpv is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2.1 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 Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with mpv. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#import <Foundation/Foundation.h>
|
|
#include "options/path.h"
|
|
#include "osdep/path.h"
|
|
|
|
const char *mp_get_platform_path_osx(void *talloc_ctx, const char *type)
|
|
{
|
|
if (strcmp(type, "osxbundle") == 0 && getenv("MPVBUNDLE")) {
|
|
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
|
|
NSString *path = [[NSBundle mainBundle] resourcePath];
|
|
char *res = talloc_strdup(talloc_ctx, [path UTF8String]);
|
|
[pool release];
|
|
return res;
|
|
}
|
|
if (strcmp(type, "desktop") == 0 && getenv("HOME"))
|
|
return mp_path_join(talloc_ctx, getenv("HOME"), "Desktop");
|
|
return NULL;
|
|
}
|