path: root/TOOLS/osxbundle
diff options
authorwm4 <wm4@nowhere>2015-02-13 22:28:44 +0100
committerwm4 <wm4@nowhere>2015-02-13 22:28:44 +0100
commitdb167cd438b516371bc2a7b6e08a57f2054dc742 (patch)
treedc2d7926cffccd1e09d7a4be98d580526a339b46 /TOOLS/osxbundle
parentfd5403cb404ca8fb30c2c6b1f415201bbce40d77 (diff)
player: deprecate 'config' files (use mpv.conf), warn against clashes
Apparently there's at least one distro which ships a /etc/mpv/mpv.conf file (mpv doesn't install such a file). This breaks config files named 'config' located in the user's mpv config directory, because mpv first loads files named 'config' and then 'mpv.conf'. There is no mechanism for putting files with different names into the same config path order. (Even worse, that mpv.conf file only set an option to the default value. Why do distros always do very stupid things?) Print a warning on collisions. Although using 'config' was well-supported, supporting both names is starting to become messy, so deprecate 'config' and print a warning if one is found. At least we will be able to remove the whole mess once 'config' files are ignored... This also affects the osx-bundle, which intentionally used these not-so- optimal semantics. Solve it in a different way. (Unfortunately with an ifdef - it's not required, but having to explain everyone why mpv tries to load a osx-bundle.mpv file on Linux and Windows would consume energy.) Closes #1569.
Diffstat (limited to 'TOOLS/osxbundle')
-rw-r--r--TOOLS/osxbundle/ (renamed from TOOLS/osxbundle/
1 files changed, 0 insertions, 0 deletions
diff --git a/TOOLS/osxbundle/ b/TOOLS/osxbundle/
index ff78dfacf6..ff78dfacf6 100644
--- a/TOOLS/osxbundle/
+++ b/TOOLS/osxbundle/