summaryrefslogtreecommitdiffstats
path: root/input
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-03-08 09:14:30 +0000
committerreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-03-08 09:14:30 +0000
commit4a5c933303a85cce089ee46ef93f2b9e176e12f7 (patch)
treed806cc0f24229991493fb1ef6ad52e58c43d0fcc /input
parente46d74d4aebe66706988cbdae79d938f9beb6928 (diff)
downloadmpv-4a5c933303a85cce089ee46ef93f2b9e176e12f7.tar.bz2
mpv-4a5c933303a85cce089ee46ef93f2b9e176e12f7.tar.xz
Add an option to disable the default key binding that MPlayer includes
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28878 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'input')
-rw-r--r--input/input.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/input/input.c b/input/input.c
index a12dd27958..6d73be1b3e 100644
--- a/input/input.c
+++ b/input/input.c
@@ -583,6 +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 char* config_file = "input.conf";
/* Apple Remote */
@@ -611,6 +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 },
{ NULL, NULL, 0, 0, 0, 0, NULL}
};
@@ -1078,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(cmd == NULL)
+ if(default_binds && cmd == NULL)
cmd = mp_input_find_bind_for_key(def_cmd_binds,n,keys);
if(cmd == NULL) {