Mercurial > mplayer.hg

changeset 4836:f832f7bcf76b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Added an option to select the input config file
author albeu
date Sun, 24 Feb 2002 13:03:47 +0000
parents 1f59d4d73558
children 4ad0455a8a6d
files input/input.c
diffstat 1 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/input/input.c	Sun Feb 24 12:05:12 2002 +0000
+++ b/input/input.c	Sun Feb 24 13:03:47 2002 +0000
@@ -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;