From 32f235bcef49b268126262f45637b6818767f065 Mon Sep 17 00:00:00 2001 From: wm4 Date: Mon, 19 Sep 2016 19:50:41 +0200 Subject: options: remove some M_OPT_FIXED flags --quiet can be always set - the playloop checks it whenever rendering the status line. Nothing special about it. The ytdl- options are simply refetched by the Lua script every time a stream is opened, so it makes sense to be able to change them at runtime as well. The VO options don't have a real reason to be marked with it anymore. --- options/options.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/options/options.c b/options/options.c index 6db3e945a9..631d108119 100644 --- a/options/options.c +++ b/options/options.c @@ -148,10 +148,10 @@ static const m_option_t mp_vo_opt_list[] = { OPT_CHOICE_C("hwdec-preload", hwdec_preload_api, 0, mp_hwdec_names), OPT_SUBSTRUCT("sws", sws_opts, sws_conf, 0), OPT_FLAG("taskbar-progress", taskbar_progress, 0), - OPT_FLAG("ontop", ontop, M_OPT_FIXED), - OPT_FLAG("border", border, M_OPT_FIXED), - OPT_FLAG("fit-border", fit_border, M_OPT_FIXED), - OPT_FLAG("on-all-workspaces", all_workspaces, M_OPT_FIXED), + OPT_FLAG("ontop", ontop, 0), + OPT_FLAG("border", border, 0), + OPT_FLAG("fit-border", fit_border, 0), + OPT_FLAG("on-all-workspaces", all_workspaces, 0), OPT_GEOMETRY("geometry", geometry, 0), OPT_SIZE_BOX("autofit", autofit, 0), OPT_SIZE_BOX("autofit-larger", autofit_larger, 0), @@ -161,9 +161,9 @@ static const m_option_t mp_vo_opt_list[] = { OPT_STRING("x11-name", winname, 0), OPT_FLOATRANGE("monitoraspect", force_monitor_aspect, 0, 0.0, 9.0), OPT_FLOATRANGE("monitorpixelaspect", monitor_pixel_aspect, 0, 0.2, 9.0), - OPT_FLAG("fullscreen", fullscreen, M_OPT_FIXED), + OPT_FLAG("fullscreen", fullscreen, 0), OPT_ALIAS("fs", "fullscreen"), - OPT_FLAG("native-keyrepeat", native_keyrepeat, M_OPT_FIXED), + OPT_FLAG("native-keyrepeat", native_keyrepeat, 0), OPT_FLOATRANGE("panscan", panscan, 0, 0.0, 1.0), OPT_FLOATRANGE("video-zoom", zoom, 0, -20.0, 20.0), OPT_FLOATRANGE("video-pan-x", pan_x, 0, -3.0, 3.0), @@ -253,7 +253,7 @@ const m_option_t mp_opts[] = { OPT_FLAG("shuffle", shuffle, 0), // ------------------------- common options -------------------- - OPT_FLAG("quiet", quiet, CONF_GLOBAL | M_OPT_NOPROP), + OPT_FLAG("quiet", quiet, 0), OPT_FLAG_STORE("really-quiet", verbose, CONF_GLOBAL | CONF_PRE_PARSE | M_OPT_NOPROP, -10), OPT_FLAG("terminal", use_terminal, CONF_GLOBAL | CONF_PRE_PARSE | M_OPT_TERM), @@ -284,8 +284,8 @@ const m_option_t mp_opts[] = { OPT_KEYVALUELIST("script-opts", script_opts, 0), 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), - OPT_KEYVALUELIST("ytdl-raw-options", lua_ytdl_raw_options, CONF_GLOBAL), + 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), #endif -- cgit v1.2.3