diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-03-25 21:31:56 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-03-25 21:31:56 +0000 |
| commit | cfda7714e9061d221663169331475b749434a999 (patch) | |
| tree | 8fadd7ed0f7f24441e107922bf287fa2d0baa758 /input | |
| parent | 8a629b04c5f60213b255235c21c2127cf329dd28 (diff) | |
| download | mpv-cfda7714e9061d221663169331475b749434a999.tar.bz2 mpv-cfda7714e9061d221663169331475b749434a999.tar.xz | |
Rename 'default-binds' input option to 'default-bindings'.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29058 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'input')
| -rw-r--r-- | input/input.c | 8 |
1 files changed, 4 insertions, 4 deletions
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) { |