Mercurial > mplayer.hg
diff input/input.c @ 29023:d1647b4a4838
Rename 'default-binds' input option to 'default-bindings'.
author | diego |
---|---|
date | Wed, 25 Mar 2009 21:31:56 +0000 |
parents | 9a5655b78698 |
children | 0f1b5b68af32 |
line wrap: on
line diff
--- 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) {