From cfda7714e9061d221663169331475b749434a999 Mon Sep 17 00:00:00 2001 From: diego Date: Wed, 25 Mar 2009 21:31:56 +0000 Subject: [PATCH] Rename 'default-binds' input option to 'default-bindings'. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29058 b3059339-0415-0410-9bf9-f77b7e298cf2 --- DOCS/man/en/mplayer.1 | 2 +- DOCS/man/fr/mplayer.1 | 2 +- DOCS/man/hu/mplayer.1 | 2 +- DOCS/man/ru/mplayer.1 | 2 +- DOCS/man/zh_CN/mplayer.1 | 2 +- input/input.c | 8 ++++---- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1 index 8233491fc7..92c7347fd3 100644 --- a/DOCS/man/en/mplayer.1 +++ b/DOCS/man/en/mplayer.1 @@ -960,7 +960,7 @@ Device to be used for Apple IR Remote (default is autodetected, Linux only). Delay in milliseconds before we start to autorepeat a key (0 to disable). .IPs ar-rate Number of key presses to generate per second on autorepeat. -.IPs (no)default-binds +.IPs (no)default-bindings Use the key bindings that MPlayer ships with by default. .IPs keylist Prints all keys that can be bound to commands. diff --git a/DOCS/man/fr/mplayer.1 b/DOCS/man/fr/mplayer.1 index 7db9bed6f6..4c2ce468e2 100644 --- a/DOCS/man/fr/mplayer.1 +++ b/DOCS/man/fr/mplayer.1 @@ -1010,7 +1010,7 @@ d'une touche (0 pour désactiver). .IPs ar-rate Combien de frappes par seconde pendant la répétition automatique. -.IPs (no)default-binds +.IPs (no)default-bindings Répond aux touches de contrôle par défaut de MPlayer. .IPs keylist Affiche toutes les touches pouvant être attachées. diff --git a/DOCS/man/hu/mplayer.1 b/DOCS/man/hu/mplayer.1 index 2af43ac8e6..d5a206d691 100644 --- a/DOCS/man/hu/mplayer.1 +++ b/DOCS/man/hu/mplayer.1 @@ -958,7 +958,7 @@ Az Apple IR t Egy gomb automatikus ismétlése elõtti késleltetés miliszekundumban (0: kikapcsolás). .IPs ar-rate Billentyû/másodperc érték megadása autorepeat használata esetén. -.IPs (no)default-binds +.IPs (no)default-bindings Az alapértelmezetten MPlayerbe épített billentyû-hozzárendeléseket használja. .IPs keylist Az összes használható billentyû listájának kiírása. diff --git a/DOCS/man/ru/mplayer.1 b/DOCS/man/ru/mplayer.1 index 7e48bd1147..d719820930 100644 --- a/DOCS/man/ru/mplayer.1 +++ b/DOCS/man/ru/mplayer.1 @@ -922,7 +922,7 @@ mplayer \-heartbeat\-cmd "gnome\-screensaver\-command \-p" file úÁÄÅÒÖËÁ × ÍÉÌÌÉÓÅËÕÎÄÁÈ ÐÅÒÅÄ ÎÁÞÁÌÏÍ Á×ÔÏÐÏ×ÔÏÒÁ (0 ÄÌÑ ÏÔËÌÀÞÅÎÉÑ). .IPs ar\-rate ëÏÌÉÞÅÓÔ×Ï ËÌÁ×ÉÛ × ÓÅËÕÎÄÕ, ÇÅÎÅÒÉÒÕÅÍÙÈ ÐÒÉ Á×ÔÏÐÏ×ÔÏÒÅ. -.IPs (no)default-binds +.IPs (no)default-bindings éÓÐÏÌØÚÏ×ÁÔØ ÐÒÉ×ÑÚËÉ ËÌÁ×ÉÛ, ÐÏÓÔÁ×ÌÑÅÍÙÅ Ó MPlayer ÐÏ ÕÍÏÌÞÁÎÉÀ. .IPs keylist ÷Ù×ÏÄÉÔ ×ÓÅ ËÌÁ×ÉÛÉ, ËÏÔÏÒÙÅ ÍÏÖÎÏ ÎÁÚÎÁÞÉÔØ ËÏÍÁÎÄÁÍ. diff --git a/DOCS/man/zh_CN/mplayer.1 b/DOCS/man/zh_CN/mplayer.1 index 15abe81c43..fdebb455ef 100644 --- a/DOCS/man/zh_CN/mplayer.1 +++ b/DOCS/man/zh_CN/mplayer.1 @@ -911,7 +911,7 @@ mplayer \-heartbeat\-cmd "gnome\-screensaver\-command \-p" file 在开始自动重复一个键之前等待多少毫秒 (0 代表停用)。 .IPs ar-rate 自动重复数是每秒重复多少次按键。 -.IPs (no)default-binds +.IPs (no)default-bindings 默认情况下使用 MPlayer 自带的键位设置。 .IPs keylist 列出所有可以被绑定于命令的键。 diff --git a/input/input.c b/input/input.c index 6d73be1b3e..ee5342fcb3 100644 --- a/input/input.c +++ b/input/input.c @@ -583,7 +583,7 @@ static mp_cmd_t* ar_cmd = NULL; static unsigned int ar_delay = 100, ar_rate = 8, last_ar = 0; static int use_joystick = 1, use_lirc = 1, use_lircc = 1; -static int default_binds = 1; +static int default_bindings = 1; static char* config_file = "input.conf"; /* Apple Remote */ @@ -612,8 +612,8 @@ static m_option_t input_conf[] = { { "cmdlist", mp_input_print_cmd_list, CONF_TYPE_FUNC, CONF_GLOBAL, 0, 0, NULL }, { "js-dev", &js_dev, CONF_TYPE_STRING, CONF_GLOBAL, 0, 0, NULL }, { "file", &in_file, CONF_TYPE_STRING, CONF_GLOBAL, 0, 0, NULL }, - { "default-binds", &default_binds, CONF_TYPE_FLAG, CONF_GLOBAL, 0, 1, NULL }, - { "nodefault-binds", &default_binds, CONF_TYPE_FLAG, CONF_GLOBAL, 1, 0, NULL }, + { "default-bindings", &default_bindings, CONF_TYPE_FLAG, CONF_GLOBAL, 0, 1, NULL }, + { "nodefault-bindings", &default_bindings, CONF_TYPE_FLAG, CONF_GLOBAL, 1, 0, NULL }, { NULL, NULL, 0, 0, 0, 0, NULL} }; @@ -1081,7 +1081,7 @@ mp_input_get_cmd_from_keys(int n,int* keys, int paused) { cmd = mp_input_find_bind_for_key(cmd_binds,n,keys); if(cmd_binds_default && cmd == NULL) cmd = mp_input_find_bind_for_key(cmd_binds_default,n,keys); - if(default_binds && cmd == NULL) + if(default_bindings && cmd == NULL) cmd = mp_input_find_bind_for_key(def_cmd_binds,n,keys); if(cmd == NULL) { -- 2.11.4.GIT