summaryrefslogtreecommitdiffstats
path: root/m_option.h
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2012-08-06 00:10:13 +0200
committerwm4 <wm4@nowhere>2012-08-06 00:10:13 +0200
commit1ce5ca5f26d65359de632cc96a3d745fdeab2465 (patch)
tree6663d582f3ff7c50e49797e644590ea229b7f460 /m_option.h
parent94782e464d985b6e653618d8a61cf2ee817c3e9f (diff)
downloadmpv-1ce5ca5f26d65359de632cc96a3d745fdeab2465.tar.bz2
mpv-1ce5ca5f26d65359de632cc96a3d745fdeab2465.tar.xz
options: get rid of some compatibility stuff
Doesn't make sense because we broke/are going to break compatibility with everything anyway. Remove mechanism for warning the user against disabled options. Remove colorspace alternative option values.
Diffstat (limited to 'm_option.h')
-rw-r--r--m_option.h6
1 files changed, 0 insertions, 6 deletions
diff --git a/m_option.h b/m_option.h
index 416471ea0e..4ab7e9c1d2 100644
--- a/m_option.h
+++ b/m_option.h
@@ -421,11 +421,6 @@ static inline void m_option_free(const m_option_t *opt, void *dst)
#define OPTION_PATH_SEPARATOR ':'
#endif
-// The code will interpret arguments different from 1 as disabled, thus
-// CONFIG_FOO etc mean disabled if no such macro is defined.
-#define OPT_START_CONDITIONAL(enable, featurename) OPT_START_CONDITIONAL_AFTERMACROEVAL(enable, featurename)
-#define OPT_START_CONDITIONAL_AFTERMACROEVAL(enable, featurename) {"conditional functionality: " #enable, .p = featurename}
-
#define OPTDEF_STR(s) .defval = (void *)&(char * const){s}
#define OPTDEF_INT(i) .defval = (void *)&(const int){i}
@@ -457,7 +452,6 @@ static inline void m_option_free(const m_option_t *opt, void *dst)
#define OPT_CHOICE(...) OPT_CHOICE_(__VA_ARGS__, .type = &m_option_type_choice)
#define OPT_CHOICE_(optname, varname, flags, choices, ...) OPT_GENERAL(optname, varname, flags, .priv = (void *)&(const struct m_opt_choice_alternatives[]){OPT_HELPER_REMOVEPAREN choices, {NULL}}, __VA_ARGS__)
#define OPT_TIME(...) OPT_GENERAL(__VA_ARGS__, .type = &m_option_type_time)
-#define OPT_ERRORMESSAGE(optname, message) {.name = optname, .p = message, .type = &m_option_type_print}
#define OPT_BASE_STRUCT struct MPOpts