[Mplayer-cvslog] CVS: main/input input.c,1.30,1.31

[Alban Bedel CVS]

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

Modified Files:
	input.c 
Log Message:
Added -input js-dev xx option to specifies the joystick device to use.


Index: input.c
===================================================================
RCS file: /cvsroot/mplayer/main/input/input.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- input.c	12 Apr 2002 10:17:24 -0000	1.30
+++ input.c	20 Apr 2002 08:51:09 -0000	1.31
@@ -292,6 +292,8 @@
 static int use_joystick = 1, use_lirc = 1;
 static char* config_file = "input.conf";
 
+static char* js_dev = NULL;
+
 static int mp_input_print_key_list(config_t* cfg);
 static int mp_input_print_cmd_list(config_t* cfg);
 
@@ -302,6 +304,7 @@
   { "ar-rate", &ar_rate, CONF_TYPE_INT, CONF_GLOBAL, 0, 0, NULL },
   { "keylist", mp_input_print_key_list, CONF_TYPE_FUNC, CONF_GLOBAL, 0, 0, NULL },
   { "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 },
   { NULL, NULL, 0, 0, 0, 0, NULL}
 };
 
@@ -1235,7 +1238,7 @@
 
 #ifdef HAVE_JOYSTICK
   if(use_joystick) {
-    int fd = mp_input_joystick_init(NULL);
+    int fd = mp_input_joystick_init(js_dev);
     if(fd < 0)
       mp_msg(MSGT_INPUT,MSGL_ERR,"Can't init input joystick\n");
     else