diff options
| author | wm4 <wm4@nowhere> | 2012-09-05 02:17:13 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2012-09-18 21:07:29 +0200 |
| commit | c955549204c433abd1a3c8783f1b988e29315337 (patch) | |
| tree | 47da7a2a9f552a810713b788513683f694eeec0c /m_option.h | |
| parent | d29d4df634a9d847a2b5ef7a04f32726cd03c1ef (diff) | |
| download | mpv-c955549204c433abd1a3c8783f1b988e29315337.tar.bz2 mpv-c955549204c433abd1a3c8783f1b988e29315337.tar.xz | |
options: change --loop option, and extend choice option type
The --loop option takes slightly different parameters now. --loop=0
used to mean looping forever. Now it means looping is disabled (this is
more logical: 2 means playing 2 more times, 1 means playing 1 more time,
and 0 should mean playing not again).
Now --loop=inf must be used to enable looping forever.
Extend choice types to allow an optional range of integers as values.
If CONF_RANGE is added to the flags of a m_option_type_choice option,
m_option.min/max specify a range of allowed integer values. This can be
used to remove "special" values from make integer range options. These
special values are unintuitive, and sometimes expose mplayer internals
to the user. The (internal) choice values can be freely mixed with the
specified integer value range. If there are overlaps, the choice values
are preferred for conversion to/from strings.
Also make sure the extension to choice options works with properties.
Add the ability to step choice properties downwards, instead of just
upwards.
Diffstat (limited to 'm_option.h')
| -rw-r--r-- | m_option.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/m_option.h b/m_option.h index f46b14281c..2b3ab13355 100644 --- a/m_option.h +++ b/m_option.h @@ -465,6 +465,10 @@ static inline void m_option_free(const m_option_t *opt, void *dst) #define OPT_HELPER_REMOVEPAREN(...) __VA_ARGS__ #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__) +// Union of choices and an int range. The choice values can be included in the +// int range, or be completely separate - both works. +#define OPT_CHOICE_OR_INT(...) OPT_CHOICE_OR_INT_(__VA_ARGS__, .type = &m_option_type_choice) +#define OPT_CHOICE_OR_INT_(optname, varname, flags, minval, maxval, choices, ...) OPT_GENERAL(optname, varname, (flags) | CONF_RANGE, .min = minval, .max = maxval, .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) // subconf must have the type struct m_sub_options. |