Mercurial > mplayer.hg

diff cfg-mplayer.h @ 20251:2971196cd8c6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 3699ab89b154
children f601726df501
line wrap: on
line diff
--- 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},