Update of /cvsroot/mplayer/main In directory mplayer:/var/tmp.root/cvs-serv22928 Modified Files: mplayer.c Log Message: -alang/-slang fixed Index: mplayer.c =================================================================== RCS file: /cvsroot/mplayer/main/mplayer.c,v retrieving revision 1.372 retrieving revision 1.373 diff -u -r1.372 -r1.373 --- mplayer.c 19 Jan 2002 17:22:57 -0000 1.372 +++ mplayer.c 20 Jan 2002 00:39:54 -0000 1.373 @@ -886,6 +886,13 @@ exit_player(MSGTR_Exit_eof); } +#ifdef USE_DVDREAD +current_module="dvd lang->id"; +if(audio_lang && audio_id==-1) audio_id=dvd_aid_from_lang(stream,audio_lang); +if(dvdsub_lang && dvdsub_id==-1) dvdsub_id=dvd_sid_from_lang(stream,dvdsub_lang); +current_module=NULL; +#endif + // initial prefill: 20% later: 5% (should be set by -cacheopts) if(stream_cache_size) stream_enable_cache(stream,stream_cache_size*1024,stream_cache_size*1024/5,stream_cache_size*1024/20); @@ -1013,18 +1020,14 @@ } #ifdef USE_DVDREAD -current_module="dvd lang->id"; -if(audio_lang && audio_id==-1) audio_id=dvd_aid_from_lang(stream,audio_lang); -if(dvdsub_lang && dvdsub_id==-1) dvdsub_id=dvd_sid_from_lang(stream,dvdsub_lang); - current_module="spudec"; vo_spudec=spudec_new_scaled(stream->priv?((dvd_priv_t *)(stream->priv))->cur_pgc->palette:NULL, sh_video->disp_w, sh_video->disp_h); if (vo_spudec!=NULL) inited_flags|=INITED_SPUDEC; -#endif current_module=NULL; - +#endif + #ifdef USE_SUB // after reading video params we should load subtitles because // we know fps so now we can adjust subtitles time to ~6 seconds AST