comparison libao2/ao_win32.c @ 28819:eabcc805acb1

Remove now unused buf_write_pos variable from ao_win32

28818:e3d54ef875a5

static WAVEHDR*     waveBlocks;         //pointer to our ringbuffer memory
static HWAVEOUT     hWaveOut;           //handle to the waveout device
static unsigned int buf_write=0;
static unsigned int buf_write_pos=0;
static volatile int full_buffers=0;
static volatile int buffered_bytes=0;


static ao_info_t info = 

    for(i = 0; i < BUFFER_COUNT; i++) {
        waveBlocks[i].lpData = buffer;
        buffer += BUFFER_SIZE;
    }
    buf_write=0;
    buf_write_pos=0;
    full_buffers=0;
    buffered_bytes=0;

    return 1;
}

// stop playing and empty buffers (for seeking/pause)
static void reset(void)
{
   	waveOutReset(hWaveOut);
	buf_write=0;
    buf_write_pos=0;
	full_buffers=0;
	buffered_bytes=0;
}

// stop playing, keep buffers (for pause)

    //unprepare the header if it is prepared
	if(current->dwFlags & WHDR_PREPARED) 
           waveOutUnprepareHeader(hWaveOut, current, sizeof(WAVEHDR));
	x=BUFFER_SIZE;          
    if(x>len) x=len;                   
    fast_memcpy(current->lpData+buf_write_pos,data+len2,x); 
    full_buffers++;
    len2+=x; len-=x;                 
	buffered_bytes+=x;
	//prepare header and write data to device
	current->dwBufferLength = x;

28819:eabcc805acb1

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;


static ao_info_t info = 

    for(i = 0; i < BUFFER_COUNT; i++) {
        waveBlocks[i].lpData = buffer;
        buffer += BUFFER_SIZE;
    }
    buf_write=0;
    full_buffers=0;
    buffered_bytes=0;

    return 1;
}

// stop playing and empty buffers (for seeking/pause)
static void reset(void)
{
   	waveOutReset(hWaveOut);
	buf_write=0;
	full_buffers=0;
	buffered_bytes=0;
}

// stop playing, keep buffers (for pause)

    //unprepare the header if it is prepared
	if(current->dwFlags & WHDR_PREPARED) 
           waveOutUnprepareHeader(hWaveOut, current, sizeof(WAVEHDR));
	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
	current->dwBufferLength = x;