[Mplayer-cvslog] CVS: main mencoder.c, 1.251, 1.252 mp_msg.h, 1.29, 1.30 mplayer.c, 1.774, 1.775

[Roberto Togni]

On 2004.08.24 21:36, Diego Biurrun CVS wrote:
> CVS change done by Diego Biurrun CVS
> 
> Update of /cvsroot/mplayer/main
> In directory mail:/var2/tmp/cvs-serv23023
> 
> Modified Files:
> 	mencoder.c mp_msg.h mplayer.c
> Log Message:
> printf -> mp_msg conversion, first steps
> patch by The Wanderer <inverseparadox at comcast.net>
> 
> 
> Index: mencoder.c
>    if(!filename){
> -	printf(MSGTR_MissingFilename);
> +	mp_msg(MSGT_FIXME, MSGL_FIXME, MSGTR_MissingFilename);
>  	mencoder_exit(1,NULL);
>    }
I think that everything that is followed by an exit can be placed in  
class MSGL_ERR or MSGL_FATAL, they are both used for this purpose in  
other places in the file (see below).
If the program terminates because of the error probably fatal is  
better.

> @@ -507,7 +507,7 @@
>    demuxer=demux_open 
> (stream,file_format,audio_id,video_id,dvdsub_id,filename);
>    if(!demuxer){
>          mp_msg(MSGT_DEMUXER,MSGL_ERR,MSGTR_FormatNotRecognized);
> -	printf(MSGTR_CannotOpenDemuxer);
> +	mp_msg(MSGT_DEMUXER, MSGL_ERR, MSGTR_CannotOpenDemuxer);
> //correct target/level? FIXME?
>  	mencoder_exit(1,NULL);
>    }
> 
> @@ -519,12 +519,12 @@
> 
>    if(!sh_video)
>    {
> -	mp_msg(MSGT_CPLAYER,MSGL_FATAL,"Video stream is
> mandatory!\n");
> +	mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_VideoStreamRequired);
>  	mencoder_exit(1,NULL);

Ciao,
 Roberto