diff options
| author | wm4 <wm4@nowhere> | 2015-02-15 17:29:06 +0100 |
|---|---|---|
| committer | Diogo Franco (Kovensky) <diogomfranco@gmail.com> | 2015-02-16 18:16:36 +0900 |
| commit | 23959eb5b485694188517d031cbfa60a8a231e8d (patch) | |
| tree | 983b0e7ad9d7c9af3cf51cdc3539a37821261e77 | |
| parent | 21a95f5ed98204c2b4cb5ca00ea8498f0db07a9e (diff) | |
| download | mpv-23959eb5b485694188517d031cbfa60a8a231e8d.tar.bz2 mpv-23959eb5b485694188517d031cbfa60a8a231e8d.tar.xz | |
osxbundle: config file special case isn't needed anymore
The previous commit effectively fixes the mess caused by 'config' vs.
'mpv.conf', and the hack introduced by commit e01a6dac and extended by
commit db167cd4 isn't needed anymore.
(cherry picked from commit 816d7bba1f3842146fa12c98232070559e72e807)
| -rw-r--r-- | TOOLS/osxbundle/mpv.app/Contents/Resources/mpv.conf (renamed from TOOLS/osxbundle/mpv.app/Contents/Resources/osx-bundle.conf) | 0 | ||||
| -rw-r--r-- | player/configfiles.c | 6 |
2 files changed, 0 insertions, 6 deletions
diff --git a/TOOLS/osxbundle/mpv.app/Contents/Resources/osx-bundle.conf b/TOOLS/osxbundle/mpv.app/Contents/Resources/mpv.conf index ff78dfacf6..ff78dfacf6 100644 --- a/TOOLS/osxbundle/mpv.app/Contents/Resources/osx-bundle.conf +++ b/TOOLS/osxbundle/mpv.app/Contents/Resources/mpv.conf diff --git a/player/configfiles.c b/player/configfiles.c index 463d1a4f41..bc89439e3a 100644 --- a/player/configfiles.c +++ b/player/configfiles.c @@ -84,12 +84,6 @@ void mp_parse_cfgfiles(struct MPContext *mpctx) talloc_free(cf); #endif - // Stupid hack to set OSX bundle defaults, if applicable. (The file is only - // found if starting from the OSX bundle.) -#if HAVE_COCOA - load_all_cfgfiles(mpctx, section, "osx-bundle.conf"); -#endif - load_all_cfgfiles(mpctx, section, "mpv.conf|config"); if (encoding) |