From c6eed70a1316fe7207c3b3ce5d8aa76360b13833 Mon Sep 17 00:00:00 2001 From: albeu Date: Fri, 17 May 2002 23:51:37 +0000 Subject: 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() git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6112 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libao2/ao_dxr2.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'libao2') diff --git a/libao2/ao_dxr2.c b/libao2/ao_dxr2.c index 4164824413..8f0d28d50f 100644 --- a/libao2/ao_dxr2.c +++ b/libao2/ao_dxr2.c @@ -68,6 +68,9 @@ static int freq_id=0; // 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 @@ static void audio_resume() 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; -- cgit v1.2.3