mirror of
https://github.com/mpv-player/mpv
synced 2024-08-04 14:59:58 +02:00
autodetect vobsub filename, disable autosub if vobsub found.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4771 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
78bc50b036
commit
64f3eca29d
23
mplayer.c
23
mplayer.c
@ -764,6 +764,22 @@ play_dvd:
|
||||
|
||||
if(filename) mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_Playing, filename);
|
||||
|
||||
current_module="vobsub";
|
||||
if (vobsub_name){
|
||||
vo_vobsub=vobsub_open(vobsub_name);
|
||||
if(vo_vobsub==NULL)
|
||||
mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CantLoadSub,vobsub_name);
|
||||
}else if(sub_auto && filename && (strlen(filename)>=5)){
|
||||
/* try to autodetect vobsub from movie filename ::atmos */
|
||||
char *buf = malloc((strlen(filename)-3) * sizeof(char));
|
||||
memset(buf,0,strlen(filename)-3); // make sure string is terminated
|
||||
strncpy(buf, filename, strlen(filename)-4);
|
||||
vo_vobsub=vobsub_open(buf);
|
||||
free(buf);
|
||||
}
|
||||
if(vo_vobsub)
|
||||
sub_auto=0; // don't do autosub for textsubs if vobsub found
|
||||
|
||||
#ifdef USE_SUB_OLD
|
||||
// check .sub
|
||||
if(sub_name){
|
||||
@ -789,13 +805,6 @@ play_dvd:
|
||||
if(subtitles && stream_dump_type==4) dump_mpsub(subtitles, fps);
|
||||
#endif
|
||||
|
||||
current_module="vobsub";
|
||||
if (vobsub_name){
|
||||
vo_vobsub=vobsub_open(vobsub_name);
|
||||
if(vo_vobsub==NULL)
|
||||
mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CantLoadSub,vobsub_name);
|
||||
}
|
||||
|
||||
stream=NULL;
|
||||
demuxer=NULL;
|
||||
d_audio=NULL;
|
||||
|
Loading…
Reference in New Issue
Block a user