[Mplayer-cvslog] CVS: main cfg-common.h, 1.131, 1.132 cfg-mencoder.h, 1.84, 1.85 cfg-mplayer.h, 1.218, 1.219

[The Wanderer]

Diego Biurrun CVS wrote:

> CVS change done by Diego Biurrun CVS
> 
> Update of /cvsroot/mplayer/main
> In directory mail:/var2/tmp/cvs-serv26100
> 
> Modified Files:
> 	cfg-common.h cfg-mencoder.h cfg-mplayer.h 
> Log Message:
> spelling, wording, consistency in comments and printed messages
> 
> Index: cfg-common.h
> ===================================================================
> RCS file: /cvsroot/mplayer/main/cfg-common.h,v
> retrieving revision 1.131
> retrieving revision 1.132
> diff -u -r1.131 -r1.132
> --- cfg-common.h	26 Apr 2004 08:53:41 -0000	1.131
> +++ cfg-common.h	3 May 2004 10:09:18 -0000	1.132

>  #endif
>  	{"slang", &dvdsub_lang, CONF_TYPE_STRING, 0, 0, 0, NULL},
>  
> -        {"dvdauth", "libcss support is OBSOLETED! RTFM!\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
> -        {"dvdkey", "libcss support is OBSOLETED! RTFM!\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
> -	{"csslib", "libcss support is OBSOLETED! RTFM!\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
> +        {"dvdauth", "libcss is obsolete. Try libdvdread instead.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
> +        {"dvdkey", "libcss is obsolete. Try libdvdread instead.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
> +	{"csslib", "libcss support is obsolete. Try libdvdread instead.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
>  
>  #ifdef MPLAYER_NETWORK
>  	{"user", &network_username, CONF_TYPE_STRING, 0, 0, 0, NULL},

Any particular reason why the third of these does not remove the word 
"support", as the others do?

>  	{"saveidx", &index_file_save, CONF_TYPE_STRING, 0, 0, 0, NULL},
>  	{"loadidx", &index_file_load, CONF_TYPE_STRING, 0, 0, 0, NULL},
>  
> -	// select audio/videosubtitle stream
> +	// select audio/video subtitle stream
>  	{"aid", &audio_id, CONF_TYPE_INT, CONF_RANGE, 0, 8190, NULL},
>  	{"vid", &video_id, CONF_TYPE_INT, CONF_RANGE, 0, 8190, NULL},
>  	{"sid", &dvdsub_id, CONF_TYPE_INT, CONF_RANGE, 0, 8190, NULL},

Incorrect - the inserted space should have been a slash.

(Live and learn... I've never come across the -vid option before.)

> @@ -189,10 +189,10 @@
>  
>          {"flip", &flip, CONF_TYPE_FLAG, 0, -1, 1, NULL},
>          {"noflip", &flip, CONF_TYPE_FLAG, 0, -1, 0, NULL},
> -	{"tsfastparse", "-tsfastparse isn't a valid option anymore.\n", CONF_TYPE_PRINT, CONF_NOCFG ,0,0, NULL
> +	{"tsfastparse", "-tsfastparse is not a valid option anymore.\n", CONF_TYPE_PRINT, CONF_NOCFG ,0,0, NULL
>  },
>  	{"tsprog", &ts_prog, CONF_TYPE_INT, CONF_RANGE, 0, 65534, NULL},

Suggest "is no longer a valid option". This could be a matter of taste.

> @@ -288,7 +288,7 @@
>  /* defined in codec-cfg.c */
>  extern char * codecs_file;
>  
> -/* from dec_audio, currently used for ac3surround decoder only */
> +/* from dec_audio, currently used for AC3 surround decoder only */
>  extern int audio_output_channels;
>  
>  #ifdef MPLAYER_NETWORK

Are you sure this isn't a reference to a decoder called "ac3surround"?

> Index: cfg-mencoder.h
> ===================================================================
> RCS file: /cvsroot/mplayer/main/cfg-mencoder.h,v
> retrieving revision 1.84
> retrieving revision 1.85
> diff -u -r1.84 -r1.85
> --- cfg-mencoder.h	30 Apr 2004 21:33:52 -0000	1.84
> +++ cfg-mencoder.h	3 May 2004 10:09:18 -0000	1.85

> @@ -168,8 +169,8 @@
>  
>  	{"endpos", parse_end_at, CONF_TYPE_FUNC_PARAM, 0, 0, 0, NULL},
>  
> -	// set output framerate - recommended for variable fps (.asf etc) files
> -	// and for 29.97fps progressive mpeg2 streams
> +	// set output framerate - recommended for variable fps (ASF etc) files
> +	// and for 29.97fps progressive MPEG2 streams
>  	{"ofps", &force_ofps, CONF_TYPE_FLOAT, CONF_MIN, 0, 0, NULL},
>  	{"o", &out_filename, CONF_TYPE_STRING, 0, 0, 0, NULL},
>  

Technically this should be "variable-FPS". That's a nitpick, though.