summaryrefslogtreecommitdiffstats
path: root/input
diff options
context:
space:
mode:
authorMartin Herkt <lachs0r@srsfckn.biz>2014-04-24 17:27:27 +0200
committerMartin Herkt <lachs0r@srsfckn.biz>2014-05-04 02:46:05 +0200
commit32c63fc1192b6ef0b57ba2552630f572b84968fd (patch)
treec0c0522bdfc9513a4f253b4bff745a9ea57eae42 /input
parente24d736404216d01966f05656dc28d248833f894 (diff)
downloadmpv-32c63fc1192b6ef0b57ba2552630f572b84968fd.tar.bz2
mpv-32c63fc1192b6ef0b57ba2552630f572b84968fd.tar.xz
options: rename input-related options
--ar → --input-appleremote --consolecontrols → --input-terminal --media-keys → --input-media-keys --joystick → --input-joystick --lirc → --input-lirc --lircconf → --input-lirc-conf --mouse-movements → --input-cursor --right-alt-gr → --input-right-alt-gr
Diffstat (limited to 'input')
-rw-r--r--input/input.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/input/input.c b/input/input.c
index fee469b9d4..ed9a15c017 100644
--- a/input/input.c
+++ b/input/input.c
@@ -208,15 +208,15 @@ static const m_option_t input_config[] = {
const m_option_t mp_input_opts[] = {
{ "input", (void *)&input_config, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
OPT_INTRANGE("doubleclick-time", input.doubleclick_time, 0, 0, 1000),
- OPT_FLAG("joystick", input.use_joystick, CONF_GLOBAL),
- OPT_FLAG("lirc", input.use_lirc, CONF_GLOBAL),
- OPT_FLAG("right-alt-gr", input.use_alt_gr, CONF_GLOBAL),
+ OPT_FLAG("input-joystick", input.use_joystick, CONF_GLOBAL),
+ OPT_FLAG("input-lirc", input.use_lirc, CONF_GLOBAL),
+ OPT_FLAG("input-right-alt-gr", input.use_alt_gr, CONF_GLOBAL),
#if HAVE_LIRC
- OPT_STRING("lircconf", input.lirc_configfile, CONF_GLOBAL),
+ OPT_STRING("input-lirc-conf", input.lirc_configfile, CONF_GLOBAL),
#endif
#if HAVE_COCOA
- OPT_FLAG("ar", input.use_ar, CONF_GLOBAL),
- OPT_FLAG("media-keys", input.use_media_keys, CONF_GLOBAL),
+ OPT_FLAG("input-appleremote", input.use_appleremote, CONF_GLOBAL),
+ OPT_FLAG("input-media-keys", input.use_media_keys, CONF_GLOBAL),
#endif
{ NULL, NULL, 0, 0, 0, 0, NULL}
};
@@ -1537,7 +1537,7 @@ struct input_ctx *mp_input_init(struct mpv_global *global)
}
#if HAVE_COCOA
- if (input_conf->use_ar) {
+ if (input_conf->use_appleremote) {
cocoa_init_apple_remote();
ictx->using_ar = true;
}