RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-01-15 19:42:53 +00:00
Code Issues Releases Wiki Activity

Fix after the patch of Dominik Mierzejewski. Try the user's input.conf

Browse Source 
before the global one.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6552 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
albeu 2002-06-24 12:17:23 +00:00
parent c45d0b29f0
commit 1be8d376dd
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
input/input.c
View File

@ -298,7 +298,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;
static char* config_file = CONFDIR"/input.conf";
static char* config_file = "input.conf";
static char* js_dev = NULL;
@ -1250,8 +1250,12 @@ mp_input_init(void) {
if(!file)
return;
if(! mp_input_parse_config(file))
mp_msg(MSGT_INPUT,MSGL_WARN,"Falling back on default (hardcoded) input config\n");
if(! mp_input_parse_config(file)) {
// Try global conf dir
file = CONFDIR"/input.conf";
if(! mp_input_parse_config(file))
mp_msg(MSGT_INPUT,MSGL_WARN,"Falling back on default (hardcoded) input config\n");
}
#ifdef HAVE_JOYSTICK
if(use_joystick) {