From a3124a4f5d9d2fa6d8fd4ae33786c4706b459f41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20B=C5=93sch?= Date: Thu, 4 Nov 2010 05:41:47 +0100 Subject: options: add OPT_MAKE_FLAGS macro, creates "opt/noopt" flag pair --- input/input.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) (limited to 'input') diff --git a/input/input.c b/input/input.c index 658e34f4dc..294e091bf4 100644 --- a/input/input.c +++ b/input/input.c @@ -605,21 +605,16 @@ 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_FLAG_ON("default-bindings", input.default_bindings, CONF_GLOBAL), - OPT_FLAG_OFF("nodefault-bindings", input.default_bindings, CONF_GLOBAL), + OPT_MAKE_FLAGS("default-bindings", input.default_bindings, CONF_GLOBAL), { NULL, NULL, 0, 0, 0, 0, NULL} }; static const m_option_t mp_input_opts[] = { { "input", &input_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, - OPT_FLAG_OFF("nojoystick", input.use_joystick, CONF_GLOBAL), - OPT_FLAG_ON("joystick", input.use_joystick, CONF_GLOBAL), - OPT_FLAG_OFF("nolirc", input.use_lirc, CONF_GLOBAL), - OPT_FLAG_ON("lirc", input.use_lirc, CONF_GLOBAL), - OPT_FLAG_OFF("nolircc", input.use_lircc, CONF_GLOBAL), - OPT_FLAG_ON("lircc", input.use_lircc, CONF_GLOBAL), - OPT_FLAG_OFF("noar", input.use_ar, CONF_GLOBAL), - OPT_FLAG_ON("ar", input.use_ar, CONF_GLOBAL), + 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), { NULL, NULL, 0, 0, 0, 0, NULL} }; -- cgit v1.2.3