From 23959eb5b485694188517d031cbfa60a8a231e8d Mon Sep 17 00:00:00 2001 From: wm4 Date: Sun, 15 Feb 2015 17:29:06 +0100 Subject: 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) --- TOOLS/osxbundle/mpv.app/Contents/Resources/mpv.conf | 3 +++ TOOLS/osxbundle/mpv.app/Contents/Resources/osx-bundle.conf | 3 --- player/configfiles.c | 6 ------ 3 files changed, 3 insertions(+), 9 deletions(-) create mode 100644 TOOLS/osxbundle/mpv.app/Contents/Resources/mpv.conf delete mode 100644 TOOLS/osxbundle/mpv.app/Contents/Resources/osx-bundle.conf diff --git a/TOOLS/osxbundle/mpv.app/Contents/Resources/mpv.conf b/TOOLS/osxbundle/mpv.app/Contents/Resources/mpv.conf new file mode 100644 index 0000000000..ff78dfacf6 --- /dev/null +++ b/TOOLS/osxbundle/mpv.app/Contents/Resources/mpv.conf @@ -0,0 +1,3 @@ +screenshot-template=~/Desktop/shot%n +quiet +idle=once diff --git a/TOOLS/osxbundle/mpv.app/Contents/Resources/osx-bundle.conf b/TOOLS/osxbundle/mpv.app/Contents/Resources/osx-bundle.conf deleted file mode 100644 index ff78dfacf6..0000000000 --- a/TOOLS/osxbundle/mpv.app/Contents/Resources/osx-bundle.conf +++ /dev/null @@ -1,3 +0,0 @@ -screenshot-template=~/Desktop/shot%n -quiet -idle=once 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) -- cgit v1.2.3