summaryrefslogtreecommitdiffstats
path: root/options/m_option.h
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2016-09-17 17:04:13 +0200
committerwm4 <wm4@nowhere>2016-09-17 17:04:13 +0200
commit7fa26bfd9c2c927e8f90089f2fe1822c72ea11d0 (patch)
treee9db3ad20f998880d74950e080f7f7fd475337d9 /options/m_option.h
parent4395a4f83709a538538cee9d14de522c024b1713 (diff)
downloadmpv-7fa26bfd9c2c927e8f90089f2fe1822c72ea11d0.tar.bz2
mpv-7fa26bfd9c2c927e8f90089f2fe1822c72ea11d0.tar.xz
options: kill M_OPT_GLOBAL flag
This meant "cannot be used as per-file option" (wrt. playlist items). Doesn't make too much sense anymore, especially given how obscure per-file options are.
Diffstat (limited to 'options/m_option.h')
-rw-r--r--options/m_option.h7
1 files changed, 2 insertions, 5 deletions
diff --git a/options/m_option.h b/options/m_option.h
index 024b62521a..a4019f411a 100644
--- a/options/m_option.h
+++ b/options/m_option.h
@@ -360,9 +360,6 @@ struct m_option {
// The option is forbidden in config files.
#define M_OPT_NOCFG (1 << 2)
-// This option can't be set per-file when used with struct m_config.
-#define M_OPT_GLOBAL (1 << 4)
-
// 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
@@ -386,7 +383,7 @@ struct m_option {
#define CONF_MAX M_OPT_MAX
#define CONF_RANGE M_OPT_RANGE
#define CONF_NOCFG M_OPT_NOCFG
-#define CONF_GLOBAL (M_OPT_GLOBAL | M_OPT_FIXED)
+#define CONF_GLOBAL M_OPT_FIXED
#define CONF_PRE_PARSE M_OPT_PRE_PARSE
// These flags are used to describe special parser capabilities or behavior.
@@ -686,7 +683,7 @@ extern const char m_option_path_separator;
#define OPT_PRINT(optname, fn) \
{.name = optname, \
- .flags = M_OPT_FIXED | M_OPT_GLOBAL | M_OPT_NOCFG | M_OPT_PRE_PARSE, \
+ .flags = M_OPT_FIXED | M_OPT_NOCFG | M_OPT_PRE_PARSE, \
.type = &m_option_type_print_fn, \
.priv = MP_EXPECT_TYPE(m_opt_print_fn, fn), \
.offset = -1}