[Mplayer-cvslog] CVS: main/input input.c,1.39,1.40

[Alban Bedel CVS]

Update of /cvsroot/mplayer/main/input
In directory mail:/var/tmp.root/cvs-serv29367/input

Modified Files:
	input.c 
Log Message:
Fix after the patch of Dominik Mierzejewski. Try the user's input.conf
before the global one.


Index: input.c
===================================================================
RCS file: /cvsroot/mplayer/main/input/input.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- input.c	24 Jun 2002 08:23:48 -0000	1.39
+++ input.c	24 Jun 2002 12:17:23 -0000	1.40
@@ -298,7 +298,7 @@
 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 @@
   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) {