diff options
| author | wm4 <wm4@nowhere> | 2016-09-20 00:59:54 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2016-09-20 01:24:27 +0200 |
| commit | fb67db8b72a329fd017409338d6742c773ce85bf (patch) | |
| tree | ff0a6dc6d6ba554d9ecf867147bc1bbd0d663a15 /options | |
| parent | bf5c97a6c38352d492020cd5d6c7563c709bca9d (diff) | |
| download | mpv-fb67db8b72a329fd017409338d6742c773ce85bf.tar.bz2 mpv-fb67db8b72a329fd017409338d6742c773ce85bf.tar.xz | |
player: make --osc/--ytdl settable during playback
Setting the osc or ytdl properties will now load/unload the associated
scripts. (For ytdl this does not mean the currently played URL will be
reloaded.)
Also add a changelog entry for this, which also covers the preceding
work for --terminal.
Diffstat (limited to 'options')
| -rw-r--r-- | options/m_option.h | 3 | ||||
| -rw-r--r-- | options/options.c | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/options/m_option.h b/options/m_option.h index 74af6b732e..20b671df4e 100644 --- a/options/m_option.h +++ b/options/m_option.h @@ -385,7 +385,8 @@ struct m_option { #define UPDATE_RENDERER (1 << 15) // mainly vo_opengl options #define UPDATE_VIDEOPOS (1 << 16) // video position (panscan etc.) #define UPDATE_OSD (1 << 17) // related to OSD rendering -#define UPDATE_OPT_LAST (1 << 17) +#define UPDATE_BUILTIN_SCRIPTS (1 << 18) // osc/ytdl +#define UPDATE_OPT_LAST (1 << 18) // All bits between _FIRST and _LAST (inclusive) #define UPDATE_OPTS_MASK \ diff --git a/options/options.c b/options/options.c index df2888f5f9..533dda244c 100644 --- a/options/options.c +++ b/options/options.c @@ -282,8 +282,8 @@ const m_option_t mp_opts[] = { #if HAVE_LUA OPT_STRINGLIST("script", script_files, CONF_GLOBAL | M_OPT_FILE), OPT_KEYVALUELIST("script-opts", script_opts, 0), - OPT_FLAG("osc", lua_load_osc, CONF_GLOBAL), - OPT_FLAG("ytdl", lua_load_ytdl, CONF_GLOBAL), + OPT_FLAG("osc", lua_load_osc, UPDATE_BUILTIN_SCRIPTS), + OPT_FLAG("ytdl", lua_load_ytdl, UPDATE_BUILTIN_SCRIPTS), OPT_STRING("ytdl-format", lua_ytdl_format, 0), OPT_KEYVALUELIST("ytdl-raw-options", lua_ytdl_raw_options, 0), OPT_FLAG("load-scripts", auto_load_scripts, CONF_GLOBAL), |