# HG changeset patch
# User atmos4
# Date 1014244866 0
# Node ID 59f8fd64538b1926da7b34ebae99b3f36b944e23
# Parent  75a701b39d618373b379a3a984359396558dd41f
autodetect vobsub filename, disable autosub if vobsub found.

diff -r 75a701b39d61 -r 59f8fd64538b mplayer.c
--- a/mplayer.c	Wed Feb 20 17:23:00 2002 +0000
+++ b/mplayer.c	Wed Feb 20 22:41:06 2002 +0000
@@ -764,6 +764,22 @@
 
     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 @@
   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;