Mercurial > mplayer.hg
comparison m_option.h @ 34169:9b617726812c
Sanitize include behaviour.
The normal func_param argument type will iterate over all previous
values each time a new value is assigned.
This leads e.g. to a complete mess and non-working recursion limiting
when creating a config file that includes itself.
Seem to also fix bug #1994.
| author | reimar |
|---|---|
| date | Tue, 25 Oct 2011 20:18:35 +0000 |
| parents | 11d9ef2177ec |
| children | 87a1b3a11b33 |
comparison
equal
deleted
inserted
replaced
| 34168:55abe5125482 | 34169:9b617726812c |
|---|---|
| 60 extern const m_option_type_t m_option_type_afmt; | 60 extern const m_option_type_t m_option_type_afmt; |
| 61 | 61 |
| 62 // Func-based types | 62 // Func-based types |
| 63 extern const m_option_type_t m_option_type_func_full; | 63 extern const m_option_type_t m_option_type_func_full; |
| 64 extern const m_option_type_t m_option_type_func_param; | 64 extern const m_option_type_t m_option_type_func_param; |
| 65 extern const m_option_type_t m_option_type_func_param_immediate; | |
| 65 extern const m_option_type_t m_option_type_func; | 66 extern const m_option_type_t m_option_type_func; |
| 66 | 67 |
| 67 /// Callback used to reset func options. | 68 /// Callback used to reset func options. |
| 68 typedef void (*m_opt_default_func_t)(const m_option_t *, const char*); | 69 typedef void (*m_opt_default_func_t)(const m_option_t *, const char*); |
| 69 | 70 |
| 175 #define CONF_TYPE_FLOAT (&m_option_type_float) | 176 #define CONF_TYPE_FLOAT (&m_option_type_float) |
| 176 #define CONF_TYPE_DOUBLE (&m_option_type_double) | 177 #define CONF_TYPE_DOUBLE (&m_option_type_double) |
| 177 #define CONF_TYPE_STRING (&m_option_type_string) | 178 #define CONF_TYPE_STRING (&m_option_type_string) |
| 178 #define CONF_TYPE_FUNC (&m_option_type_func) | 179 #define CONF_TYPE_FUNC (&m_option_type_func) |
| 179 #define CONF_TYPE_FUNC_PARAM (&m_option_type_func_param) | 180 #define CONF_TYPE_FUNC_PARAM (&m_option_type_func_param) |
| 181 #define CONF_TYPE_FUNC_PARAM_IMMEDIATE (&m_option_type_func_param_immediate) | |
| 180 #define CONF_TYPE_PRINT (&m_option_type_print) | 182 #define CONF_TYPE_PRINT (&m_option_type_print) |
| 181 #define CONF_TYPE_PRINT_INDIRECT (&m_option_type_print_indirect) | 183 #define CONF_TYPE_PRINT_INDIRECT (&m_option_type_print_indirect) |
| 182 #define CONF_TYPE_PRINT_FUNC (&m_option_type_print_func) | 184 #define CONF_TYPE_PRINT_FUNC (&m_option_type_print_func) |
| 183 #define CONF_TYPE_FUNC_FULL (&m_option_type_func_full) | 185 #define CONF_TYPE_FUNC_FULL (&m_option_type_func_full) |
| 184 #define CONF_TYPE_SUBCONFIG (&m_option_type_subconfig) | 186 #define CONF_TYPE_SUBCONFIG (&m_option_type_subconfig) |