diff options
Diffstat (limited to 'options')
-rw-r--r-- | options/m_config.c | 5 | ||||
-rw-r--r-- | options/m_config.h | 3 | ||||
-rw-r--r-- | options/m_option.h | 8 | ||||
-rw-r--r-- | options/options.c | 37 |
4 files changed, 20 insertions, 33 deletions
diff --git a/options/m_config.c b/options/m_config.c index ce74b791c6..3fe8a67235 100644 --- a/options/m_config.c +++ b/options/m_config.c @@ -725,9 +725,6 @@ static int handle_set_opt_flags(struct m_config *config, (co->is_set_from_cmdline || co->is_set_from_config)) set = false; - if ((flags & M_SETOPT_NO_FIXED) && (optflags & M_OPT_FIXED)) - return M_OPT_INVALID; - if ((flags & M_SETOPT_NO_PRE_PARSE) && (optflags & M_OPT_PRE_PARSE)) return M_OPT_INVALID; @@ -1100,8 +1097,6 @@ void m_config_print_option_list(const struct m_config *config, const char *name) MP_INFO(config, " [not in config files]"); if (opt->flags & M_OPT_FILE) MP_INFO(config, " [file]"); - if (opt->flags & M_OPT_FIXED) - MP_INFO(config, " [no runtime changes]"); if (opt->type == &m_option_type_alias) MP_INFO(config, " for %s", (char *)opt->priv); if (opt->type == &m_option_type_cli_alias) diff --git a/options/m_config.h b/options/m_config.h index c843aa01f0..3456aab526 100644 --- a/options/m_config.h +++ b/options/m_config.h @@ -150,13 +150,12 @@ enum { M_SETOPT_FROM_CMDLINE = 8, // Mark as set by command line M_SETOPT_BACKUP = 16, // Call m_config_backup_opt() before M_SETOPT_PRESERVE_CMDLINE = 32, // Don't set if already marked as FROM_CMDLINE - M_SETOPT_NO_FIXED = 64, // Reject M_OPT_FIXED options M_SETOPT_NO_PRE_PARSE = 128, // Reject M_OPT_PREPARSE options M_SETOPT_NO_OVERWRITE = 256, // Skip options marked with FROM_* }; // Flags for safe option setting during runtime. -#define M_SETOPT_RUNTIME M_SETOPT_NO_FIXED +#define M_SETOPT_RUNTIME 0 // Set the named option to the given string. This is for command line and config // file use only. diff --git a/options/m_option.h b/options/m_option.h index cd785a5cab..7be8ae4b7b 100644 --- a/options/m_option.h +++ b/options/m_option.h @@ -386,12 +386,6 @@ char *format_file_size(int64_t size); // The option is forbidden in config files. #define M_OPT_NOCFG (1 << 2) -// Can not be freely changed at runtime (normally, all options can be changed, -// even if the settings don't get effective immediately). Note that an option -// might still change even if this is set, e.g. via properties or per-file -// options. -#define M_OPT_FIXED (1 << 3) - // The option should be set during command line pre-parsing #define M_OPT_PRE_PARSE (1 << 4) @@ -707,7 +701,7 @@ extern const char m_option_path_separator; #define OPT_PRINT(optname, fn) \ {.name = optname, \ - .flags = M_OPT_FIXED | M_OPT_NOCFG | M_OPT_PRE_PARSE | M_OPT_NOPROP, \ + .flags = M_OPT_NOCFG | M_OPT_PRE_PARSE | M_OPT_NOPROP, \ .type = &m_option_type_print_fn, \ .priv = MP_EXPECT_TYPE(m_opt_print_fn, fn), \ .offset = -1} diff --git a/options/options.c b/options/options.c index 53cf82abd8..d8d4c015d7 100644 --- a/options/options.c +++ b/options/options.c @@ -320,39 +320,38 @@ const struct m_sub_options filter_conf = { const m_option_t mp_opts[] = { // handled in command line pre-parser (parse_commandline.c) - {"v", &m_option_type_dummy_flag, M_OPT_FIXED | CONF_NOCFG | M_OPT_NOPROP, + {"v", &m_option_type_dummy_flag, CONF_NOCFG | M_OPT_NOPROP, .offset = -1}, - {"playlist", CONF_TYPE_STRING, CONF_NOCFG | M_OPT_MIN | M_OPT_FIXED | M_OPT_FILE, + {"playlist", CONF_TYPE_STRING, CONF_NOCFG | M_OPT_MIN | M_OPT_FILE, .min = 1, .offset = -1}, - {"{", &m_option_type_dummy_flag, CONF_NOCFG | M_OPT_FIXED | M_OPT_NOPROP, + {"{", &m_option_type_dummy_flag, CONF_NOCFG | M_OPT_NOPROP, .offset = -1}, - {"}", &m_option_type_dummy_flag, CONF_NOCFG | M_OPT_FIXED | M_OPT_NOPROP, + {"}", &m_option_type_dummy_flag, CONF_NOCFG | M_OPT_NOPROP, .offset = -1}, // handled in m_config.c { "include", CONF_TYPE_STRING, M_OPT_FILE, .offset = -1}, { "profile", CONF_TYPE_STRING_LIST, 0, .offset = -1}, - { "show-profile", CONF_TYPE_STRING, CONF_NOCFG | M_OPT_FIXED | - M_OPT_NOPROP | M_OPT_OPTIONAL_PARAM, .offset = -1}, - { "list-options", &m_option_type_dummy_flag, CONF_NOCFG | M_OPT_FIXED | - M_OPT_NOPROP, .offset = -1}, - OPT_FLAG("list-properties", property_print_help, - CONF_NOCFG | M_OPT_FIXED | M_OPT_NOPROP), - { "help", CONF_TYPE_STRING, CONF_NOCFG | M_OPT_FIXED | M_OPT_NOPROP | - M_OPT_OPTIONAL_PARAM, .offset = -1}, - { "h", CONF_TYPE_STRING, CONF_NOCFG | M_OPT_FIXED | M_OPT_NOPROP | - M_OPT_OPTIONAL_PARAM, .offset = -1}, + { "show-profile", CONF_TYPE_STRING, CONF_NOCFG | M_OPT_NOPROP | + M_OPT_OPTIONAL_PARAM, .offset = -1}, + { "list-options", &m_option_type_dummy_flag, CONF_NOCFG | M_OPT_NOPROP, + .offset = -1}, + OPT_FLAG("list-properties", property_print_help, CONF_NOCFG | M_OPT_NOPROP), + { "help", CONF_TYPE_STRING, CONF_NOCFG | M_OPT_NOPROP | M_OPT_OPTIONAL_PARAM, + .offset = -1}, + { "h", CONF_TYPE_STRING, CONF_NOCFG | M_OPT_NOPROP | M_OPT_OPTIONAL_PARAM, + .offset = -1}, OPT_PRINT("list-protocols", stream_print_proto_list), OPT_PRINT("version", print_version), OPT_PRINT("V", print_version), #if HAVE_TESTS - OPT_STRING("unittest", test_mode, CONF_NOCFG | M_OPT_FIXED | M_OPT_NOPROP), + OPT_STRING("unittest", test_mode, CONF_NOCFG | M_OPT_NOPROP), #endif OPT_CHOICE("player-operation-mode", operation_mode, - M_OPT_FIXED | M_OPT_PRE_PARSE | M_OPT_NOPROP, + M_OPT_PRE_PARSE | M_OPT_NOPROP, ({"cplayer", 0}, {"pseudo-gui", 1})), OPT_FLAG("shuffle", shuffle, 0), @@ -378,13 +377,13 @@ const m_option_t mp_opts[] = { {"belownormal", BELOW_NORMAL_PRIORITY_CLASS}, {"idle", IDLE_PRIORITY_CLASS})), #endif - OPT_FLAG("config", load_config, M_OPT_FIXED | CONF_PRE_PARSE), + OPT_FLAG("config", load_config, CONF_PRE_PARSE), OPT_STRING("config-dir", force_configdir, - M_OPT_FIXED | CONF_NOCFG | CONF_PRE_PARSE | M_OPT_FILE), + CONF_NOCFG | CONF_PRE_PARSE | M_OPT_FILE), OPT_STRINGLIST("reset-on-next-file", reset_options, 0), #if HAVE_LUA || HAVE_JAVASCRIPT - OPT_PATHLIST("scripts", script_files, M_OPT_FIXED | M_OPT_FILE), + OPT_PATHLIST("scripts", script_files, M_OPT_FILE), OPT_CLI_ALIAS("script", "scripts-append"), OPT_KEYVALUELIST("script-opts", script_opts, 0), OPT_FLAG("load-scripts", auto_load_scripts, 0), |