# HG changeset patch
# User diego
# Date 1238016716 0
# Node ID d1647b4a4838a496550136a3b4404c7303e52f6a
# Parent  9e1d1197c567a625b5c7168074cc9e6d911fc576
Rename 'default-binds' input option to 'default-bindings'.

diff -r 9e1d1197c567 -r d1647b4a4838 DOCS/man/en/mplayer.1
--- 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.
diff -r 9e1d1197c567 -r d1647b4a4838 DOCS/man/fr/mplayer.1
--- 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 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 -r 9e1d1197c567 -r d1647b4a4838 DOCS/man/hu/mplayer.1
--- 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 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 -r 9e1d1197c567 -r d1647b4a4838 DOCS/man/ru/mplayer.1
--- 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
 ������� ��� �������, ������� ����� ��������� ��������.
diff -r 9e1d1197c567 -r d1647b4a4838 DOCS/man/zh_CN/mplayer.1
--- 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
 列出所有可以被绑定于命令的键。
diff -r 9e1d1197c567 -r d1647b4a4838 input/input.c
--- 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) {