diff options
| author | Martin Herkt <lachs0r@srsfckn.biz> | 2014-04-24 17:27:27 +0200 |
|---|---|---|
| committer | Martin Herkt <lachs0r@srsfckn.biz> | 2014-05-04 02:46:05 +0200 |
| commit | 32c63fc1192b6ef0b57ba2552630f572b84968fd (patch) | |
| tree | c0c0522bdfc9513a4f253b4bff745a9ea57eae42 /options | |
| parent | e24d736404216d01966f05656dc28d248833f894 (diff) | |
| download | mpv-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 'options')
| -rw-r--r-- | options/options.c | 6 | ||||
| -rw-r--r-- | options/options.h | 2 | ||||
| -rw-r--r-- | options/parse_commandline.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/options/options.c b/options/options.c index 646ebc490f..6a7aab43bd 100644 --- a/options/options.c +++ b/options/options.c @@ -602,8 +602,8 @@ const m_option_t mp_opts[] = { OPT_FLAG("slave-broken", slave_mode, CONF_GLOBAL), OPT_FLAG("idle", player_idle_mode, M_OPT_GLOBAL), OPT_INTRANGE("key-fifo-size", input.key_fifo_size, CONF_GLOBAL, 2, 65000), - OPT_FLAG("consolecontrols", consolecontrols, CONF_GLOBAL), - OPT_FLAG("mouse-movements", vo.enable_mouse_movements, CONF_GLOBAL), + OPT_FLAG("input-terminal", consolecontrols, CONF_GLOBAL), + OPT_FLAG("input-cursor", vo.enable_mouse_movements, CONF_GLOBAL), #if HAVE_TV {"tvscan", (void *) tvscan_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, #endif /* HAVE_TV */ @@ -764,7 +764,7 @@ const struct MPOpts mp_default_opts = { .use_lirc = 1, .use_alt_gr = 1, #if HAVE_COCOA - .use_ar = 1, + .use_appleremote = 1, .use_media_keys = 1, #endif .default_bindings = 1, diff --git a/options/options.h b/options/options.h index 650ee21f5e..551b5911b6 100644 --- a/options/options.h +++ b/options/options.h @@ -279,7 +279,7 @@ typedef struct MPOpts { char *lirc_configfile; int use_lircc; int use_alt_gr; - int use_ar; + int use_appleremote; int use_media_keys; int default_bindings; int test; diff --git a/options/parse_commandline.c b/options/parse_commandline.c index 93ab47299f..e1c84b9f27 100644 --- a/options/parse_commandline.c +++ b/options/parse_commandline.c @@ -262,7 +262,7 @@ int m_config_parse_mp_command_line(m_config_t *config, struct playlist *files, // Lock stdin if it will be used as input if (bstrcmp0(file, "-") == 0) - m_config_set_option0(config, "consolecontrols", "no"); + m_config_set_option0(config, "input-console", "no"); } } |