Mercurial > mplayer.hg
comparison input/input.c @ 10272:7b0bc557987b
renames: DATADIR->MPLAYER_DATADIR, CONFDIR->MPLAYER_CONFDIR, LIBDIR->MPLAYER_LIBDIR
| author | arpi |
|---|---|
| date | Mon, 09 Jun 2003 12:15:48 +0000 |
| parents | dd32fe16a36c |
| children | 9a061dbdba3e |
comparison
equal
deleted
inserted
replaced
| 10271:f0e14d641160 | 10272:7b0bc557987b |
|---|---|
| 1462 if(!file) | 1462 if(!file) |
| 1463 return; | 1463 return; |
| 1464 | 1464 |
| 1465 if(! mp_input_parse_config(file)) { | 1465 if(! mp_input_parse_config(file)) { |
| 1466 // Try global conf dir | 1466 // Try global conf dir |
| 1467 file = CONFDIR"/input.conf"; | 1467 file = MPLAYER_CONFDIR "/input.conf"; |
| 1468 if(! mp_input_parse_config(file)) | 1468 if(! mp_input_parse_config(file)) |
| 1469 mp_msg(MSGT_INPUT,MSGL_WARN,"Falling back on default (hardcoded) input config\n"); | 1469 mp_msg(MSGT_INPUT,MSGL_WARN,"Falling back on default (hardcoded) input config\n"); |
| 1470 } | 1470 } |
| 1471 | 1471 |
| 1472 #ifdef HAVE_JOYSTICK | 1472 #ifdef HAVE_JOYSTICK |