summaryrefslogtreecommitdiffstats
path: root/options/options.c
diff options
context:
space:
mode:
authorAvi Halachmi (:avih) <avihpit@yahoo.com>2014-12-15 01:31:30 +0200
committerwm4 <wm4@nowhere>2014-12-15 04:39:56 +0100
commit39e04e929483847a3e0722d86d53f69837ed99db (patch)
tree56901ce1b9d1cb35f05d3e059d2aca83319491ff /options/options.c
parent06828f71a134e0b880601665c0daea78e6523633 (diff)
downloadmpv-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 'options/options.c')
-rw-r--r--options/options.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/options/options.c b/options/options.c
index f1bdfde4f8..e3afe5ab14 100644
--- a/options/options.c
+++ b/options/options.c
@@ -127,8 +127,8 @@ const m_option_t mp_opts[] = {
OPT_STRINGLIST("reset-on-next-file", reset_options, M_OPT_GLOBAL),
#if HAVE_LUA
- OPT_STRINGLIST("lua", lua_files, CONF_GLOBAL | M_OPT_FILE),
- OPT_KEYVALUELIST("lua-opts", lua_opts, M_OPT_GLOBAL),
+ OPT_STRINGLIST("script", script_files, CONF_GLOBAL | M_OPT_FILE),
+ OPT_KEYVALUELIST("script-opts", script_opts, M_OPT_GLOBAL),
OPT_FLAG("osc", lua_load_osc, CONF_GLOBAL),
OPT_FLAG("ytdl", lua_load_ytdl, CONF_GLOBAL),
OPT_STRING("ytdl-format", lua_ytdl_format, CONF_GLOBAL),
@@ -594,6 +594,8 @@ const m_option_t mp_opts[] = {
OPT_REMOVED("lavdopts", "use --vd-lavc-..."),
OPT_REMOVED("lavfdopts", "use --demuxer-lavf-..."),
OPT_REPLACED("lircconf", "input-lirc-conf"),
+ OPT_REPLACED("lua", "script"),
+ OPT_REPLACED("lua-opts", "script-opts"),
OPT_REMOVED("mixer-channel", "use AO suboptions (alsa, oss)"),
OPT_REMOVED("mixer", "use AO suboptions (alsa, oss)"),
OPT_REPLACED("mouse-movements", "input-cursor"),