summaryrefslogtreecommitdiffstats
path: root/core/input
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-02-08 21:09:18 +0100
committerwm4 <wm4@nowhere>2013-02-09 00:21:17 +0100
commit88d843f909f00ffd9c25016a9af58546fabbfd2c (patch)
tree835450867fbd262fac8af7831df1c7732b86ffe2 /core/input
parent267a889cc2c5ca688a2b8fc93cf8e5349a3c8a44 (diff)
downloadmpv-88d843f909f00ffd9c25016a9af58546fabbfd2c.tar.bz2
mpv-88d843f909f00ffd9c25016a9af58546fabbfd2c.tar.xz
cleanup: replace OPT_FLAG_ON and OPT_MAKE_FLAGS with OPT_FLAG
OPT_MAKE_FLAGS() used to emit two options (one with "no" prefixed), but that has been long removed by special casing flag options in the option parser. OPT_FLAG_ON() used to imply that there's no "no-" prefixed option, but this hasn't been the case for a while either. (Conceptually, it has been replaced by OPT_FLAG_STORE().) Remove OPT_FLAG_OFF, which was unused.
Diffstat (limited to 'core/input')
-rw-r--r--core/input/input.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/core/input/input.c b/core/input/input.c
index 7e94dbe453..0e2955116b 100644
--- a/core/input/input.c
+++ b/core/input/input.c
@@ -528,17 +528,17 @@ static const m_option_t input_conf[] = {
OPT_STRING("js-dev", input.js_dev, CONF_GLOBAL),
OPT_STRING("ar-dev", input.ar_dev, CONF_GLOBAL),
OPT_STRING("file", input.in_file, CONF_GLOBAL),
- OPT_MAKE_FLAGS("default-bindings", input.default_bindings, CONF_GLOBAL),
- OPT_MAKE_FLAGS("test", input.test, CONF_GLOBAL),
+ OPT_FLAG("default-bindings", input.default_bindings, CONF_GLOBAL),
+ OPT_FLAG("test", input.test, CONF_GLOBAL),
{ NULL, NULL, 0, 0, 0, 0, NULL}
};
static const m_option_t mp_input_opts[] = {
{ "input", (void *)&input_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
- OPT_MAKE_FLAGS("joystick", input.use_joystick, CONF_GLOBAL),
- OPT_MAKE_FLAGS("lirc", input.use_lirc, CONF_GLOBAL),
- OPT_MAKE_FLAGS("lircc", input.use_lircc, CONF_GLOBAL),
- OPT_MAKE_FLAGS("ar", input.use_ar, CONF_GLOBAL),
+ OPT_FLAG("joystick", input.use_joystick, CONF_GLOBAL),
+ OPT_FLAG("lirc", input.use_lirc, CONF_GLOBAL),
+ OPT_FLAG("lircc", input.use_lircc, CONF_GLOBAL),
+ OPT_FLAG("ar", input.use_ar, CONF_GLOBAL),
{ NULL, NULL, 0, 0, 0, 0, NULL}
};