From 6067203caba5f1bb91bebd73c89e82056aa8d1c2 Mon Sep 17 00:00:00 2001 From: reimar Date: Fri, 6 Mar 2009 19:07:50 +0000 Subject: get rid of full_buffers variable, if the check it is used for is triggered something is seriously wrong and the ao will not work right anyway. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28855 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libao2/ao_win32.c | 9 --------- 1 file changed, 9 deletions(-) (limited to 'libao2') diff --git a/libao2/ao_win32.c b/libao2/ao_win32.c index ed95f2378b..2072ed0404 100644 --- a/libao2/ao_win32.c +++ b/libao2/ao_win32.c @@ -87,7 +87,6 @@ static const int channel_mask[] = { static WAVEHDR* waveBlocks; //pointer to our ringbuffer memory static HWAVEOUT hWaveOut; //handle to the waveout device static unsigned int buf_write=0; -static volatile int full_buffers=0; static volatile int buffered_bytes=0; @@ -106,12 +105,7 @@ static void CALLBACK waveOutProc(HWAVEOUT hWaveOut,UINT uMsg,DWORD dwInstance, { if(uMsg != WOM_DONE) return; - if (full_buffers) { buffered_bytes-=BUFFER_SIZE; - --full_buffers; - } else { - buffered_bytes=0; - } } // to set/get/query special features/parameters @@ -239,7 +233,6 @@ static int init(int rate,int channels,int format,int flags) buffer += BUFFER_SIZE; } buf_write=0; - full_buffers=0; buffered_bytes=0; return 1; @@ -263,7 +256,6 @@ static void reset(void) { waveOutReset(hWaveOut); buf_write=0; - full_buffers=0; buffered_bytes=0; } @@ -299,7 +291,6 @@ static int write_waveOutBuffer(unsigned char* data,int len){ x=BUFFER_SIZE; if(x>len) x=len; fast_memcpy(current->lpData,data+len2,x); - full_buffers++; len2+=x; len-=x; buffered_bytes+=x; //prepare header and write data to device -- cgit v1.2.3