summaryrefslogtreecommitdiffstats
path: root/options/options.c
diff options
context:
space:
mode:
authorJames Ross-Gowan <rossy@jrg.systems>2019-12-08 03:16:10 +1100
committerwm4 <wm4@nowhere>2019-12-08 02:46:44 +0100
commitb3b2cc44fa783c1575b3e229c79f2977f75a57c1 (patch)
tree75bf9dff47ace47d426c986439a926ae1484182f /options/options.c
parentb2b15d4e6e1d92290d0d7e772b9a5468ddea8a81 (diff)
downloadmpv-b3b2cc44fa783c1575b3e229c79f2977f75a57c1.tar.bz2
mpv-b3b2cc44fa783c1575b3e229c79f2977f75a57c1.tar.xz
console.lua: add this script
Merged from mpv-repl git repo commit 5ea2bf64f9c239f0326b02. Some changes were made on top of it: - Tabs were converted to 4 spaces indentation (plus some manual indentation fixes in some places). - All user-visible mentions of "repl" were renamed to "console". - The README was converted to a manpage (with heavy changes, some additions taken from stats.rst; rossy converted the key bindings table to RST). - The method to change the default key binding was changed. - Change minor detail about "font" default value setting (not a functional change). - Integrate into the player as builtin script, including an option to prevent loading it. Above changes and commit message done by wm4. Signed-off-by: wm4 <wm4@nowhere>
Diffstat (limited to 'options/options.c')
-rw-r--r--options/options.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/options/options.c b/options/options.c
index 26aaa24c91..b7f2357ebe 100644
--- a/options/options.c
+++ b/options/options.c
@@ -400,6 +400,7 @@ static const m_option_t mp_opts[] = {
OPT_STRING("ytdl-format", lua_ytdl_format, 0),
OPT_KEYVALUELIST("ytdl-raw-options", lua_ytdl_raw_options, 0),
OPT_FLAG("load-stats-overlay", lua_load_stats, UPDATE_BUILTIN_SCRIPTS),
+ OPT_FLAG("load-osd-console", lua_load_console, UPDATE_BUILTIN_SCRIPTS),
#endif
// ------------------------- stream options --------------------
@@ -920,6 +921,7 @@ static const struct MPOpts mp_default_opts = {
.lua_ytdl_format = NULL,
.lua_ytdl_raw_options = NULL,
.lua_load_stats = 1,
+ .lua_load_console = 1,
#endif
.auto_load_scripts = 1,
.loop_times = 1,