[Mplayer-cvslog] CVS: main/libvo vo_dxr3.c,1.80,1.81

[David Holm]

Update of /cvsroot/mplayer/main/libvo
In directory mplayer:/var/tmp.root/cvs-serv14984

Modified Files:
	vo_dxr3.c 
Log Message:
Fixed bug that would cause the dxr3 to lock if too many subpics were sent at once


Index: vo_dxr3.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_dxr3.c,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- vo_dxr3.c	5 Apr 2002 18:05:57 -0000	1.80
+++ vo_dxr3.c	6 Apr 2002 07:30:28 -0000	1.81
@@ -157,6 +157,7 @@
 static int fd_video = -1;
 static int fd_spu = -1;
 static char fdv_name[80];
+static char fds_name[80];
 
 /* on screen display/subpics */
 static char *osdpicbuf = NULL;
@@ -200,7 +201,10 @@
 		if (!noprebuf) {
 			close(fd_video);
 			fd_video = open(fdv_name, O_WRONLY);
+			close(fd_spu);
+			fd_spu = open(fds_name, O_WRONLY);
 			fsync(fd_video);
+			fsync(fd_spu);
 		}
 		return VO_TRUE;
 	case VOCTRL_QUERY_FORMAT:
@@ -510,7 +514,7 @@
 		if (!noprebuf) {
 			ioctl(fd_spu, EM8300_IOCTL_SPU_SETPTS, &vo_pts);
 		}
-		/*write(fd_spu, spued->data, spued->count);*/
+		write(fd_spu, spued->data, spued->count);
 	}
 	disposd++;
 }
@@ -742,6 +746,7 @@
 			return -1;
 		}
 	}
+	strcpy(fds_name, devname);
 
 #if defined(USE_LIBAVCODEC)
 	if (mpeg_codec == MPG_CODEC_AVCODEC && !avcodec_inited) {