diff options
| author | Avi Halachmi (:avih) <avihpit@yahoo.com> | 2017-12-13 19:37:42 +0200 |
|---|---|---|
| committer | Kevin Mitchell <kevmitch@gmail.com> | 2018-04-07 16:02:16 -0700 |
| commit | 9eadc068fa13b8d83ad049e83960883d06d3c125 (patch) | |
| tree | 3c24ef08af62baffafc8c3c4345bf8f141ccef24 /player | |
| parent | b0951d71f88d29aae7babcee4a5f9dab6435ece3 (diff) | |
| download | mpv-9eadc068fa13b8d83ad049e83960883d06d3c125.tar.bz2 mpv-9eadc068fa13b8d83ad049e83960883d06d3c125.tar.xz | |
config: replace config dir lua-settings/ with dir script-opts/
lua-settings/ is still supported, with deprecation warning.
Diffstat (limited to 'player')
| -rw-r--r-- | player/lua/options.lua | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/player/lua/options.lua b/player/lua/options.lua index dd76f7ace7..4d05587ef1 100644 --- a/player/lua/options.lua +++ b/player/lua/options.lua @@ -37,8 +37,16 @@ local function read_options(options, identifier) msg.debug("reading options for " .. identifier) -- read config file - local conffilename = "lua-settings/" .. identifier .. ".conf" + local conffilename = "script-opts/" .. identifier .. ".conf" local conffile = mp.find_config_file(conffilename) + if conffile == nil then + msg.verbose(conffilename .. " not found.") + conffilename = "lua-settings/" .. identifier .. ".conf" + conffile = mp.find_config_file(conffilename) + if conffile then + msg.warn("lua-settings/ is deprecated, use directory script-opts/") + end + end local f = conffile and io.open(conffile,"r") if f == nil then -- config not found |