Update of /cvsroot/mplayer/main In directory usw-pr-cvs1:/tmp/cvs-serv13899 Modified Files: mplayer.c Log Message: print help before reading font+sub Index: mplayer.c =================================================================== RCS file: /cvsroot/mplayer/main/mplayer.c,v retrieving revision 1.59 retrieving revision 1.60 diff -C2 -r1.59 -r1.60 *** mplayer.c 2001/04/14 18:09:46 1.59 --- mplayer.c 2001/04/14 22:51:56 1.60 *************** *** 453,474 **** } ! // check font ! if(font_name){ ! vo_font=read_font_desc(font_name,font_factor,verbose>1); ! if(!vo_font) printf("Can't load font: %s\n",font_name); ! } else { ! // try default: ! vo_font=read_font_desc(get_path("font/font.desc"),font_factor,verbose>1); ! } ! ! // check .sub ! if(sub_name){ ! subtitles=sub_read_file(sub_name); ! if(!subtitles) printf("Can't load subtitles: %s\n",font_name); ! } else { ! // try default: ! subtitles=sub_read_file(get_path("default.sub")); } ! // check video_out driver name: --- 453,462 ---- } ! if(!filename){ ! if(vcd_track) filename="/dev/cdrom"; ! else { ! printf("%s",help_text); exit(0); } ! } // check video_out driver name: *************** *** 487,497 **** } - if(!filename){ - if(vcd_track) filename="/dev/cdrom"; - else { - printf("%s",help_text); exit(0); - } - } - // check codec.conf if(!parse_codec_cfg(get_path("codecs.conf"))){ --- 475,478 ---- *************** *** 499,502 **** --- 480,501 ---- exit(1); } + + // check font + if(font_name){ + vo_font=read_font_desc(font_name,font_factor,verbose>1); + if(!vo_font) printf("Can't load font: %s\n",font_name); + } else { + // try default: + vo_font=read_font_desc(get_path("font/font.desc"),font_factor,verbose>1); + } + + // check .sub + if(sub_name){ + subtitles=sub_read_file(sub_name); + if(!subtitles) printf("Can't load subtitles: %s\n",font_name); + } else { + // try default: + subtitles=sub_read_file(get_path("default.sub")); + } _______________________________________________ Mplayer-cvslog mailing list Mplayer-cvslog@lists.sourceforge.net http://lists.sourceforge.net/lists/listinfo/mplayer-cvslog