From 39e04e929483847a3e0722d86d53f69837ed99db Mon Sep 17 00:00:00 2001 From: "Avi Halachmi (:avih)" Date: Mon, 15 Dec 2014 01:31:30 +0200 Subject: 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 --- options/options.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'options/options.c') 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"), -- cgit v1.2.3