Mercurial > mplayer.hg
changeset 29023:d1647b4a4838
Rename 'default-binds' input option to 'default-bindings'.
| author | diego |
|---|---|
| date | Wed, 25 Mar 2009 21:31:56 +0000 |
| parents | 9e1d1197c567 |
| children | 0b54bdf2370c |
| files | DOCS/man/en/mplayer.1 DOCS/man/fr/mplayer.1 DOCS/man/hu/mplayer.1 DOCS/man/ru/mplayer.1 DOCS/man/zh_CN/mplayer.1 input/input.c |
| diffstat | 6 files changed, 9 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/DOCS/man/en/mplayer.1 Wed Mar 25 19:48:05 2009 +0000 +++ b/DOCS/man/en/mplayer.1 Wed Mar 25 21:31:56 2009 +0000 @@ -960,7 +960,7 @@ 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.
--- a/DOCS/man/fr/mplayer.1 Wed Mar 25 19:48:05 2009 +0000 +++ b/DOCS/man/fr/mplayer.1 Wed Mar 25 21:31:56 2009 +0000 @@ -1010,7 +1010,7 @@ (0 pour dsactiver). .IPs ar-rate Combien de frappes par seconde pendant la rptition automatique. -.IPs (no)default-binds +.IPs (no)default-bindings Rpond aux touches de contrle par dfaut de MPlayer. .IPs keylist Affiche toutes les touches pouvant tre attaches.
--- a/DOCS/man/hu/mplayer.1 Wed Mar 25 19:48:05 2009 +0000 +++ b/DOCS/man/hu/mplayer.1 Wed Mar 25 21:31:56 2009 +0000 @@ -958,7 +958,7 @@ Egy gomb automatikus ismtlse eltti ksleltets miliszekundumban (0: kikapcsols). .IPs ar-rate Billenty/msodperc rtk megadsa autorepeat hasznlata esetn. -.IPs (no)default-binds +.IPs (no)default-bindings Az alaprtelmezetten MPlayerbe ptett billenty-hozzrendelseket hasznlja. .IPs keylist Az sszes hasznlhat billenty listjnak kirsa.
--- a/DOCS/man/ru/mplayer.1 Wed Mar 25 19:48:05 2009 +0000 +++ b/DOCS/man/ru/mplayer.1 Wed Mar 25 21:31:56 2009 +0000 @@ -922,7 +922,7 @@ (0 ). .IPs ar\-rate , . -.IPs (no)default-binds +.IPs (no)default-bindings , MPlayer . .IPs keylist , .
--- a/DOCS/man/zh_CN/mplayer.1 Wed Mar 25 19:48:05 2009 +0000 +++ b/DOCS/man/zh_CN/mplayer.1 Wed Mar 25 21:31:56 2009 +0000 @@ -911,7 +911,7 @@ 在开始自动重复一个键之前等待多少毫秒 (0 代表停用)。 .IPs ar-rate 自动重复数是每秒重复多少次按键。 -.IPs (no)default-binds +.IPs (no)default-bindings 默认情况下使用 MPlayer 自带的键位设置。 .IPs keylist 列出所有可以被绑定于命令的键。
--- a/input/input.c Wed Mar 25 19:48:05 2009 +0000 +++ b/input/input.c Wed Mar 25 21:31:56 2009 +0000 @@ -583,7 +583,7 @@ 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 @@ { "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 @@ 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) {