[MPlayer-dev-eng] Error with MEncoder configuration file

[Diego Biurrun]

On Mon, Mar 13, 2006 at 04:15:43PM +0200, Ivan Kalvachev wrote:
> 2006/3/13, Diego Biurrun <diego at biurrun.de>:
> > On Sun, Mar 12, 2006 at 04:50:50PM +0100, Benjamin Zores wrote:
> > >
> > > As a result, /etc/mplayer/mencoder is recognized as well as ~/.mplayer/mencoder.
> > > But /etc/mplayer/mencoder.conf isn't recognized as it should be.
> > >
> > > Mistake in code (i vote for) or typo in MAN page ?
> >
> > I vote for changing it to mencoder.conf.  I think we had weird problems
> > with MEncoder trying to parse itself as configuration file on Windows or
> > something.
> 
> Agree

OK, how about this patch then.  Have I overlooked something?

> maybe we should rename mplayer to mplayer.conf too.

Umm, the global configuration file is named mplayer.conf already.  Do
you want to change the name of the individual config file as well.  What
about backwards compatibility?

Diego
-------------- next part --------------
Index: mencoder.c
===================================================================
RCS file: /cvsroot/mplayer/main/mencoder.c,v
retrieving revision 1.342
diff -u -r1.342 mencoder.c
--- mencoder.c	24 Feb 2006 15:43:20 -0000	1.342
+++ mencoder.c	13 Mar 2006 16:17:04 -0000
@@ -300,7 +300,7 @@
 void parse_cfgfiles( m_config_t* conf )
 {
   char *conffile;
-  if ((conffile = get_path("mencoder")) == NULL) {
+  if ((conffile = get_path("mencoder.conf")) == NULL) {
     mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_GetpathProblem);
   } else {
     if (m_config_parse_config_file(conf, conffile) < 0)
Index: DOCS/man/en/mplayer.1
===================================================================
RCS file: /cvsroot/mplayer/main/DOCS/man/en/mplayer.1,v
retrieving revision 1.1237
diff -u -r1.1237 mplayer.1
--- DOCS/man/en/mplayer.1	5 Mar 2006 22:29:26 -0000	1.1237
+++ DOCS/man/en/mplayer.1	13 Mar 2006 16:17:04 -0000
@@ -476,7 +476,7 @@
 specific one is '~/\:.mplayer/\:config'.
 The configuration file for MEncoder is 'mencoder.conf' in your configuration
 directory (e.g.\& /etc/\:mplayer or /usr/\:local/\:etc/\:mplayer), the
-user specific one is '~/\:.mplayer/\:mencoder.
+user specific one is '~/\:.mplayer/\:mencoder.conf.
 User specific options override system-wide options and options given on the
 command line override either.
 The syntax of the configuration files is 'option=<value>', everything after