diff options
| author | Avi Halachmi (:avih) <avihpit@yahoo.com> | 2014-12-15 01:31:30 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2014-12-15 04:39:56 +0100 |
| commit | 39e04e929483847a3e0722d86d53f69837ed99db (patch) | |
| tree | 56901ce1b9d1cb35f05d3e059d2aca83319491ff /player/lua | |
| parent | 06828f71a134e0b880601665c0daea78e6523633 (diff) | |
| download | mpv-39e04e929483847a3e0722d86d53f69837ed99db.tar.bz2 mpv-39e04e929483847a3e0722d86d53f69837ed99db.tar.xz | |
options: deprecate 'lua' based options/dirs for 'script'
- --lua and --lua-opts change to --script and --script-opts
- 'lua' default script dirs change to 'scripts'
- DOCS updated
- 'lua-settings' dir was _not_ modified
The old lua-based names/dirs still work, but display a warning.
Signed-off-by: wm4 <wm4@nowhere>
Diffstat (limited to 'player/lua')
| -rw-r--r-- | player/lua/defaults.lua | 2 | ||||
| -rw-r--r-- | player/lua/options.lua | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/player/lua/defaults.lua b/player/lua/defaults.lua index bb4eb648ce..4cdeef497f 100644 --- a/player/lua/defaults.lua +++ b/player/lua/defaults.lua @@ -14,7 +14,7 @@ function mp.get_script_name() end function mp.get_opt(key, def) - local opts = mp.get_property_native("options/lua-opts") + local opts = mp.get_property_native("options/script-opts") local val = opts[key] if val == nil then val = def diff --git a/player/lua/options.lua b/player/lua/options.lua index 6e53c2c48a..087e31b6ef 100644 --- a/player/lua/options.lua +++ b/player/lua/options.lua @@ -79,18 +79,18 @@ function read_options(options, identifier) end --parse command-line options - for key, val in pairs(mp.get_property_native("options/lua-opts")) do + for key, val in pairs(mp.get_property_native("options/script-opts")) do local prefix = identifier.."-" if not (string.find(key, prefix, 1, true) == nil) then key = string.sub(key, string.len(prefix)+1) -- match found values with defaults if options[key] == nil then - msg.warn("lua-opts: unknown key " .. key .. ", ignoring") + msg.warn("script-opts: unknown key " .. key .. ", ignoring") else local convval = typeconv(options[key], val) if convval == nil then - msg.error("lua-opts: error converting value '" .. val .. + msg.error("script-opts: error converting value '" .. val .. "' for key '" .. key .. "'") else options[key] = convval |