AerialX/openal-soft-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Wait until all headers are unprepared before freeing the buffer

Browse Source
This commit is contained in:
Chris Robinson 2011-07-28 08:27:52 -07:00
parent bcbc1dea25
commit f986f7dfad
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Alc/winmm.c
View File

@ -458,6 +458,7 @@ static ALCboolean WinMMResetPlayback(ALCdevice *device)
static void WinMMStopPlayback(ALCdevice *device) static void WinMMStopPlayback(ALCdevice *device)
{ {
WinMMData *pData = (WinMMData*)device->ExtraData; WinMMData *pData = (WinMMData*)device->ExtraData;
void *buffer = NULL;
int i; int i;
if(pData->hWaveThread == NULL) if(pData->hWaveThread == NULL)
@ -478,10 +479,10 @@ static void WinMMStopPlayback(ALCdevice *device)
for(i = 0;i < 4;i++) for(i = 0;i < 4;i++)
{ {
waveOutUnprepareHeader(pData->hWaveHandle.Out, &pData->WaveBuffer[i], sizeof(WAVEHDR)); waveOutUnprepareHeader(pData->hWaveHandle.Out, &pData->WaveBuffer[i], sizeof(WAVEHDR));
if(i == 0) if(i == 0) buffer = pData->WaveBuffer[i].lpData;
free(pData->WaveBuffer[i].lpData);
pData->WaveBuffer[i].lpData = NULL; pData->WaveBuffer[i].lpData = NULL;
} }
free(buffer);
} }
@ -640,6 +641,7 @@ failure:
static void WinMMCloseCapture(ALCdevice *pDevice) static void WinMMCloseCapture(ALCdevice *pDevice)
{ {
WinMMData *pData = (WinMMData*)pDevice->ExtraData; WinMMData *pData = (WinMMData*)pDevice->ExtraData;
void *buffer = NULL;
int i; int i;
// Call waveOutReset to shutdown wave device // Call waveOutReset to shutdown wave device
@ -656,10 +658,10 @@ static void WinMMCloseCapture(ALCdevice *pDevice)
for(i = 0;i < 4;i++) for(i = 0;i < 4;i++)
{ {
waveInUnprepareHeader(pData->hWaveHandle.In, &pData->WaveBuffer[i], sizeof(WAVEHDR)); waveInUnprepareHeader(pData->hWaveHandle.In, &pData->WaveBuffer[i], sizeof(WAVEHDR));
if(i == 0) if(i == 0) buffer = pData->WaveBuffer[i].lpData;
free(pData->WaveBuffer[i].lpData);
pData->WaveBuffer[i].lpData = NULL; pData->WaveBuffer[i].lpData = NULL;
} }
free(buffer);
DestroyRingBuffer(pData->pRing); DestroyRingBuffer(pData->pRing);
pData->pRing = NULL; pData->pRing = NULL;