[Mplayer-cvslog] CVS: main/libao2 ao_dxr2.c,1.2,1.3

[Alban Bedel CVS]

Update of /cvsroot/mplayer/main/libao2
In directory mail:/var/tmp.root/cvs-serv12322/libao2

Modified Files:
	ao_dxr2.c 
Log Message:
Workaround the bug in x11 vo's (if it's one) wich let a window in the way
even after vo->uninit().
Support for dvd/vobsub subtitles.
No more crash if vo->config is not called before vo->uninit() 


Index: ao_dxr2.c
===================================================================
RCS file: /cvsroot/mplayer/main/libao2/ao_dxr2.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ao_dxr2.c	13 May 2002 19:57:26 -0000	1.2
+++ ao_dxr2.c	17 May 2002 23:51:36 -0000	1.3
@@ -68,6 +68,9 @@
 // return: 1=success 0=fail
 static int init(int rate,int channels,int format,int flags){
 
+	if(dxr2_fd <= 0)
+	  return 0;
+
 	ao_data.outburst=2048;
 	ao_data.samplerate=rate;
 	ao_data.channels=channels;
@@ -139,7 +142,6 @@
 extern void dxr2_send_packet(unsigned char* data,int len,int id,int timestamp);
 extern void dxr2_send_lpcm_packet(unsigned char* data,int len,int id,int timestamp,int freq_id);
 extern int vo_pts;
-static int preload = 1;
 // return: how many bytes can be played without blocking
 static int get_space(){
     float x=(float)(vo_pts-ao_data.pts)/90000.0;