summaryrefslogtreecommitdiffstats
path: root/options
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-02-28 22:25:48 +0100
committerwm4 <wm4@nowhere>2014-02-28 22:25:48 +0100
commit1e2d409fb4f08dd73554c8c065292af325bf9f12 (patch)
tree290d0e28a3eba61e971ffd67cd6124f9c52f084e /options
parent47ede0f5e3573fb6d6f40870ed50c209a1a00a38 (diff)
downloadmpv-1e2d409fb4f08dd73554c8c065292af325bf9f12.tar.bz2
mpv-1e2d409fb4f08dd73554c8c065292af325bf9f12.tar.xz
lua: add option to disable auto-loading of lua scripts
Diffstat (limited to 'options')
-rw-r--r--options/options.c2
-rw-r--r--options/options.h1
2 files changed, 3 insertions, 0 deletions
diff --git a/options/options.c b/options/options.c
index d777fac215..202fb42c49 100644
--- a/options/options.c
+++ b/options/options.c
@@ -245,6 +245,7 @@ const m_option_t mp_opts[] = {
OPT_STRINGLIST("lua", lua_files, CONF_GLOBAL),
OPT_KEYVALUELIST("lua-opts", lua_opts, M_OPT_GLOBAL),
OPT_FLAG("osc", lua_load_osc, CONF_GLOBAL),
+ OPT_FLAG("load-scripts", auto_load_scripts, CONF_GLOBAL),
#endif
// ------------------------- stream options --------------------
@@ -696,6 +697,7 @@ const struct MPOpts mp_default_opts = {
.osd_scale = 1,
.osd_scale_by_window = 1,
.lua_load_osc = 1,
+ .auto_load_scripts = 1,
.loop_times = -1,
.ordered_chapters = 1,
.chapter_merge_threshold = 100,
diff --git a/options/options.h b/options/options.h
index daa6ab6fc5..23be601f46 100644
--- a/options/options.h
+++ b/options/options.h
@@ -55,6 +55,7 @@ typedef struct MPOpts {
char **lua_files;
char **lua_opts;
int lua_load_osc;
+ int auto_load_scripts;
struct m_obj_settings *audio_driver_list, *ao_defs;
int fixed_vo;