[MPlayer-cvslog] CVS: main mplayer.c,1.911,1.912

[Nico Sabbi CVS]

CVS change done by Nico Sabbi CVS

Update of /cvsroot/mplayer/main
In directory mail:/var2/tmp/cvs-serv27572

Modified Files:
	mplayer.c 
Log Message:
restored disabilitation of subtitles when cycling with command sub_select (previously broken in version 1.900)

Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.911
retrieving revision 1.912
diff -u -r1.911 -r1.912
--- mplayer.c	2 Mar 2006 21:19:57 -0000	1.911
+++ mplayer.c	5 Mar 2006 08:55:08 -0000	1.912
@@ -3783,12 +3783,15 @@
     case MP_CMD_SUB_SELECT:
     if (global_sub_size) {
         int source = -1;
+        int reset=0;
         int v = cmd->args[0].v.i;
 
         if (v < -1)
             global_sub_pos++;
         else
             global_sub_pos = v;
+	if(global_sub_pos == global_sub_size)
+	    reset = 1;
         if (global_sub_pos >= global_sub_size)
             global_sub_pos = -1;
         if (global_sub_pos >= 0)
@@ -3805,7 +3808,7 @@
         vo_sub_last = vo_sub = NULL;
 #endif
         vobsub_id = -1;
-	if(dvdsub_lang) {
+	if(dvdsub_lang || reset) {
         dvdsub_id = -1;
         if (d_dvdsub) d_dvdsub->id = -1;
 	}
@@ -3872,6 +3875,13 @@
             }
             if (!global_sub_quiet_osd_hack) osd_show_vobsub_changed = sh_video->fps;
         } else { // off
+#ifdef USE_DVDREAD
+            if (vo_spudec && stream->type == STREAMTYPE_DVD && dvdsub_id < 0) {
+	        dvdsub_id = -2;
+                d_dvdsub->id = dvdsub_id;
+                spudec_reset(vo_spudec);
+            }
+#endif	    
             if (!global_sub_quiet_osd_hack) osd_show_vobsub_changed = sh_video->fps;
 #ifdef USE_SUB
             vo_osd_changed(OSDTYPE_SUBTITLE);