[MPlayer-dev-eng] [PATCH] Profile support for MEncoder / MPlayer - Take 3

[Guillaume POIRIER]

Hi,

Danny - liste a écrit :
> Hi to all.
> 
> I update the patch that give profile support to MEncoder & MPlayer.
> 
> The first little patch (opt_exit.diff) permit to the option user 
> function to exit from MPlayer / Mencoder and so let useless the call to 
> 'mencoder_exit(...)' in case of errors and so the profile support is 
> avaible also for MPlayer.
> 
> I also put the messagge to translate in the correct english message file 
> and update the doc to refer to MPlayer / MEncoder and not only to MEncoder.
> 
> Hope this can reach the cvs soon ....


A few comments while I'm compiling your patch:

> diff -Naur orig/configure main/configure
> --- orig/configure	2006-01-10 22:59:15.000000000 +0100
> +++ main/configure	2006-01-08 20:16:01.000000000 +0100
> @@ -7941,6 +7941,9 @@
>  #define X11_FULLSCREEN 1
>  #endif
>  
> +/* main language selected - used by profiles.c */
> +#define MAIN_LANGUAGE	"$_language"
> +
>  #endif /* MPLAYER_CONFIG_H */
>  EOF

Is that smth necessary? Can't the current "internationnalization" system 
be used here? Just as much as one may want to have console messages 
translated in his native language, it makes sense that the language used 
picked up by profiles.c is the same, don't you think?

It must be defined somewhere in configure.

[..]

> ------------------------------------------------------------------------
> 
> diff -Naur orig/m_config.c main/m_config.c
> --- orig/m_config.c	2004-10-31 11:27:40.000000000 +0100
> +++ main/m_config.c	2006-01-14 17:31:39.000000000 +0100
> @@ -295,6 +295,9 @@
>      m_option_set(co->opt,co->opt->p,co->slots->data);
>      co->flags |= M_CFG_OPT_SET;
>    }
> +  if (co->opt->flags & M_OPT_FORCE_EXIT) {
> +      r = M_OPT_EXIT - 1;
> +  }
>  
>    return r;
>  }
> diff -Naur orig/m_option.h main/m_option.h
> --- orig/m_option.h	2006-01-01 02:19:24.000000000 +0100
> +++ main/m_option.h	2006-01-14 17:31:53.000000000 +0100
> @@ -159,6 +159,8 @@
>  #define M_OPT_NOSAVE		(1<<5)
>  // Emulate old behaviour by pushing the option only if it was set by the user
>  #define M_OPT_OLD		(1<<6)
> +// Must exit from the program, needed when we can't pass M_OPT_EXIT
> +#define M_OPT_FORCE_EXIT        (1<<7)
>  
>  // FIXME: backward compatibility
>  #define CONF_MIN		M_OPT_MIN


What do you have 2 separate patches? The main patch can't work without 
the 2nd little patch. (maybe this has been discussed before, but I have 
missed it?

Guillaume