diff options
| -rw-r--r-- | DOCS/interface-changes.rst | 1 | ||||
| -rw-r--r-- | DOCS/man/lua.rst | 2 | ||||
| -rw-r--r-- | DOCS/man/mpv.rst | 2 | ||||
| -rw-r--r-- | DOCS/man/osc.rst | 2 | ||||
| -rw-r--r-- | DOCS/man/stats.rst | 2 | ||||
| -rw-r--r-- | player/lua/options.lua | 10 |
6 files changed, 14 insertions, 5 deletions
diff --git a/DOCS/interface-changes.rst b/DOCS/interface-changes.rst index eb929e7481..663674fa70 100644 --- a/DOCS/interface-changes.rst +++ b/DOCS/interface-changes.rst @@ -85,6 +85,7 @@ Interface changes (such as "sub-file"), deprecated in mpv 0.26.0 - deprecate the old command based hook API, and introduce a proper C API (the high level Lua API for this does not change) + - rename the the lua-settings/ config directory to script-opts/ --- mpv 0.28.0 --- - rename --hwdec=mediacodec option to mediacodec-copy, to reflect conventions followed by other hardware video decoding APIs diff --git a/DOCS/man/lua.rst b/DOCS/man/lua.rst index be2cf5bcb8..f943f3421d 100644 --- a/DOCS/man/lua.rst +++ b/DOCS/man/lua.rst @@ -531,7 +531,7 @@ Example implementation:: print(options.optionA) -The config file will be stored in ``lua-settings/identifier.conf`` in mpv's user +The config file will be stored in ``script-opts/identifier.conf`` in mpv's user folder. Comment lines can be started with # and stray spaces are not removed. Boolean values will be represented with yes/no. diff --git a/DOCS/man/mpv.rst b/DOCS/man/mpv.rst index c5ab3364e5..920aa2e370 100644 --- a/DOCS/man/mpv.rst +++ b/DOCS/man/mpv.rst @@ -1172,7 +1172,7 @@ For Windows-specifics, see `FILES ON WINDOWS`_ section. ``--write-filename-in-watch-later-config`` option, and the player will add the media filename to the contents of the resume config file. -``~/.config/mpv/lua-settings/osc.conf`` +``~/.config/mpv/script-opts/osc.conf`` This is loaded by the OSC script. See the `ON SCREEN CONTROLLER`_ docs for details. diff --git a/DOCS/man/osc.rst b/DOCS/man/osc.rst index 126d0532a5..8cddaa268c 100644 --- a/DOCS/man/osc.rst +++ b/DOCS/man/osc.rst @@ -128,7 +128,7 @@ Configuration ------------- The OSC offers limited configuration through a config file -``lua-settings/osc.conf`` placed in mpv's user dir and through the +``script-opts/osc.conf`` placed in mpv's user dir and through the ``--script-opts`` command-line option. Options provided through the command-line will override those from the config file. diff --git a/DOCS/man/stats.rst b/DOCS/man/stats.rst index e06bcd6be5..31cb7ee123 100644 --- a/DOCS/man/stats.rst +++ b/DOCS/man/stats.rst @@ -35,7 +35,7 @@ monospaced digits is recommended. By default, the open source font Configuration ------------- -This script can be customized through a config file ``lua-settings/stats.conf`` +This script can be customized through a config file ``script-opts/stats.conf`` placed in mpv's user directory and through the ``--script-opts`` command-line option. The configuration syntax is described in `ON SCREEN CONTROLLER`_. 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 |