Mercurial > mplayer.hg
changeset 20251:2971196cd8c6
Disable loading of file-specific configuration file from the same
directory as the played file. Add a command-line switch to enable it.
Patch by reimar, manpage patch by me
| author | rtogni |
|---|---|
| date | Sun, 15 Oct 2006 21:27:15 +0000 |
| parents | 7cfd3a04d537 |
| children | eaaf13b39595 |
| files | DOCS/man/en/mplayer.1 cfg-mplayer.h mplayer.c |
| diffstat | 3 files changed, 10 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/DOCS/man/en/mplayer.1 Sun Oct 15 20:48:26 2006 +0000 +++ b/DOCS/man/en/mplayer.1 Sun Oct 15 21:27:15 2006 +0000 @@ -720,6 +720,11 @@ Show the description and content of a profile. . .TP +.B \-use-filedir-conf +Look for file-specific configuration file in the same directory as +the file that is been played. +. +.TP .B "\-v\ \ \ \ \ " Increment verbosity level, one level for each \-v found on the command line.
--- a/cfg-mplayer.h Sun Oct 15 20:48:26 2006 +0000 +++ b/cfg-mplayer.h Sun Oct 15 21:27:15 2006 +0000 @@ -100,6 +100,7 @@ extern void revertPPOpt(void *conf, char* opt); extern char* pp_help; extern int enable_mouse_movements; +extern int use_filedir_conf; m_option_t vd_conf[]={ {"help", "Use MPlayer with an appropriate video file instead of live partners to avoid vd.\n", CONF_TYPE_PRINT, CONF_NOCFG|CONF_GLOBAL, 0, 0, NULL}, @@ -277,6 +278,8 @@ //---------------------- mplayer-only options ------------------------ + {"use-filedir-conf", &use_filedir_conf, CONF_TYPE_FLAG, CONF_GLOBAL, 0, 1, NULL}, + {"use-filedir-conf", &use_filedir_conf, CONF_TYPE_FLAG, CONF_GLOBAL, 1, 0, NULL}, #ifdef CRASH_DEBUG {"crash-debug", &crash_debug, CONF_TYPE_FLAG, CONF_GLOBAL, 0, 1, NULL}, {"nocrash-debug", &crash_debug, CONF_TYPE_FLAG, CONF_GLOBAL, 1, 0, NULL},
--- a/mplayer.c Sun Oct 15 20:48:26 2006 +0000 +++ b/mplayer.c Sun Oct 15 21:27:15 2006 +0000 @@ -413,6 +413,7 @@ short edl_decision = 0; ///< 1 when an EDL operation has been made. FILE* edl_fd = NULL; ///< fd to write to when in -edlout mode. float begin_skip = MP_NOPTS_VALUE; ///< start time of the current skip while on edlout mode +int use_filedir_conf; static unsigned int inited_flags=0; #define INITED_VO 1 @@ -854,7 +855,7 @@ sprintf (cfg, "%s.conf", file); - if (!stat (cfg, &st)) + if (use_filedir_conf && !stat (cfg, &st)) { mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_LoadingConfig, cfg); m_config_parse_config_file (conf, cfg);