summaryrefslogtreecommitdiffstats
path: root/options
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2015-03-04 17:20:47 +0100
committerwm4 <wm4@nowhere>2015-03-04 17:28:42 +0100
commitf447179c598fcd13cd239a56044b483c660f6093 (patch)
tree288aa793a77ee9d6e7db69eb0ba6a77fd33f70d0 /options
parent3cd394995f812aba93166febd1032e3f4208d49b (diff)
downloadmpv-f447179c598fcd13cd239a56044b483c660f6093.tar.bz2
mpv-f447179c598fcd13cd239a56044b483c660f6093.tar.xz
options: add flag option type
Diffstat (limited to 'options')
-rw-r--r--options/m_option.c117
-rw-r--r--options/m_option.h4
2 files changed, 121 insertions, 0 deletions
diff --git a/options/m_option.c b/options/m_option.c
index b5f9930068..8f4299bc0d 100644
--- a/options/m_option.c
+++ b/options/m_option.c
@@ -718,6 +718,123 @@ const struct m_option_type m_option_type_choice = {
.get = choice_get,
};
+static int apply_flag(const struct m_option *opt, int *val, bstr flag)
+{
+ struct m_opt_choice_alternatives *alt = opt->priv;
+ for (alt = opt->priv; alt->name; alt++) {
+ if (bstr_equals0(flag, alt->name)) {
+ if (*val & alt->value)
+ return M_OPT_INVALID;
+ *val |= alt->value;
+ return 0;
+ }
+ }
+ return M_OPT_UNKNOWN;
+}
+
+static const char *find_next_flag(const struct m_option *opt, int *val)
+{
+ struct m_opt_choice_alternatives *alt = opt->priv;
+ for (alt = opt->priv; alt->name; alt++) {
+ if (alt->value && (alt->value & (*val)) == alt->value) {
+ *val = *val & ~(unsigned)alt->value;
+ return alt->name;
+ }
+ }
+ *val = 0; // if there are still flags left, there's not much we can do
+ return NULL;
+}
+
+static int parse_flags(struct mp_log *log, const struct m_option *opt,
+ struct bstr name, struct bstr param, void *dst)
+{
+ int value = 0;
+ while (param.len) {
+ bstr flag;
+ bstr_split_tok(param, "+", &flag, &param);
+ int r = apply_flag(opt, &value, flag);
+ if (r == M_OPT_UNKNOWN) {
+ struct m_opt_choice_alternatives *alt = opt->priv;
+ mp_fatal(log, "Invalid flag for option %.*s: %.*s\n",
+ BSTR_P(name), BSTR_P(flag));
+ mp_info(log, "Valid flags are:\n");
+ for (alt = opt->priv; alt->name; alt++)
+ mp_info(log, " %s\n", alt->name);
+ mp_info(log, "Flags can usually be combined with '+'.\n");
+ return M_OPT_INVALID;
+ } else if (r < 0) {
+ mp_fatal(log, "Option %.*s: flag '%.*s' conflicts with a previous "
+ "flag value.\n", BSTR_P(name), BSTR_P(flag));
+ return M_OPT_INVALID;
+ }
+ }
+ if (dst)
+ *(int *)dst = value;
+ return 1;
+}
+
+static int flags_set(const m_option_t *opt, void *dst, struct mpv_node *src)
+{
+ int value = 0;
+ if (src->format != MPV_FORMAT_NODE_ARRAY)
+ return M_OPT_UNKNOWN;
+ struct mpv_node_list *srclist = src->u.list;
+ for (int n = 0; n < srclist->num; n++) {
+ if (srclist->values[n].format != MPV_FORMAT_STRING)
+ return M_OPT_INVALID;
+ if (apply_flag(opt, &value, bstr0(srclist->values[n].u.string)) < 0)
+ return M_OPT_INVALID;
+ }
+ *(int *)dst = value;
+ return 0;
+}
+
+static int flags_get(const m_option_t *opt, void *ta_parent,
+ struct mpv_node *dst, void *src)
+{
+ int value = *(int *)src;
+
+ dst->format = MPV_FORMAT_NODE_ARRAY;
+ dst->u.list = talloc_zero(ta_parent, struct mpv_node_list);
+ struct mpv_node_list *list = dst->u.list;
+ while (1) {
+ const char *flag = find_next_flag(opt, &value);
+ if (!flag)
+ break;
+
+ struct mpv_node node;
+ node.format = MPV_FORMAT_STRING;
+ node.u.string = (char *)flag;
+ MP_TARRAY_APPEND(list, list->values, list->num, node);
+ }
+
+ return 1;
+}
+
+static char *print_flags(const m_option_t *opt, const void *val)
+{
+ int value = *(int *)val;
+ char *res = talloc_strdup(NULL, "");
+ while (1) {
+ const char *flag = find_next_flag(opt, &value);
+ if (!flag)
+ break;
+
+ res = talloc_asprintf_append_buffer(res, "%s%s", res[0] ? "+" : "", flag);
+ }
+ return res;
+}
+
+const struct m_option_type m_option_type_flags = {
+ .name = "Flags",
+ .size = sizeof(int),
+ .parse = parse_flags,
+ .print = print_flags,
+ .copy = copy_opt,
+ .set = flags_set,
+ .get = flags_get,
+};
+
// Float
#undef VAL
diff --git a/options/m_option.h b/options/m_option.h
index c26d1b3529..401d98473d 100644
--- a/options/m_option.h
+++ b/options/m_option.h
@@ -52,6 +52,7 @@ extern const m_option_type_t m_option_type_keyvalue_list;
extern const m_option_type_t m_option_type_time;
extern const m_option_type_t m_option_type_rel_time;
extern const m_option_type_t m_option_type_choice;
+extern const m_option_type_t m_option_type_flags;
extern const m_option_type_t m_option_type_msglevels;
extern const m_option_type_t m_option_type_print_fn;
extern const m_option_type_t m_option_type_subconfig;
@@ -626,6 +627,9 @@ extern const char m_option_path_separator;
#define OPT_CHOICE_(optname, varname, flags, choices, ...) \
OPT_GENERAL(int, optname, varname, flags, M_CHOICES(choices), __VA_ARGS__)
+#define OPT_FLAGS(...) \
+ OPT_CHOICE_(__VA_ARGS__, .type = &m_option_type_flags)
+
// 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_(optname, varname, flags, minval, maxval, choices, ...) \