[Mplayer-cvslog] CVS: main/input input.c,1.11,1.12

[Alban Bedel CVS]

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

Modified Files:
	input.c 
Log Message:
Added an option to select the input config file


Index: input.c
===================================================================
RCS file: /cvsroot/mplayer/main/input/input.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- input.c	23 Feb 2002 22:43:25 -0000	1.11
+++ input.c	24 Feb 2002 13:03:47 -0000	1.12
@@ -228,8 +228,10 @@
 static unsigned int ar_delay = 100, ar_rate = 8, last_ar = 0;
 
 static int use_joystick = 1, use_lirc = 1;
+static char* config_file = "input.conf";
 
 static config_t input_conf[] = {
+  { "conf", &config_file, CONF_TYPE_STRING, CONF_GLOBAL, 0, 0, NULL },
   { "ar-delay", &ar_delay, CONF_TYPE_INT, CONF_GLOBAL, 0, 0, NULL },
   { "ar-rate", &ar_rate, CONF_TYPE_INT, CONF_GLOBAL, 0, 0, NULL },
   { NULL, NULL, 0, 0, 0, 0, NULL}
@@ -1081,7 +1083,7 @@
 mp_input_init(void) {
   char* file;
 
-  file = get_path("input.conf");
+  file = config_file[0] != '/' ? get_path(config_file) : config_file;
   if(!file)
     return;