From db167cd438b516371bc2a7b6e08a57f2054dc742 Mon Sep 17 00:00:00 2001 From: wm4 Date: Fri, 13 Feb 2015 22:28:44 +0100 Subject: 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. --- TOOLS/osxbundle/mpv.app/Contents/Resources/config | 3 --- TOOLS/osxbundle/mpv.app/Contents/Resources/osx-bundle.conf | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) delete mode 100644 TOOLS/osxbundle/mpv.app/Contents/Resources/config create mode 100644 TOOLS/osxbundle/mpv.app/Contents/Resources/osx-bundle.conf (limited to 'TOOLS/osxbundle') diff --git a/TOOLS/osxbundle/mpv.app/Contents/Resources/config b/TOOLS/osxbundle/mpv.app/Contents/Resources/config deleted file mode 100644 index ff78dfacf6..0000000000 --- a/TOOLS/osxbundle/mpv.app/Contents/Resources/config +++ /dev/null @@ -1,3 +0,0 @@ -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 new file mode 100644 index 0000000000..ff78dfacf6 --- /dev/null +++ b/TOOLS/osxbundle/mpv.app/Contents/Resources/osx-bundle.conf @@ -0,0 +1,3 @@ +screenshot-template=~/Desktop/shot%n +quiet +idle=once -- cgit v1.2.3