a3x/re3
1
0
Fork 0
mirror of https://git.rip/DMCA_FUCKER/re3.git synced 2024-12-23 08:30:00 +00:00
Code Issues Projects Releases Wiki Activity

Fixes to OpenAL

Browse source
This commit is contained in:
Sergeanur 2020-10-26 20:13:50 +02:00
parent f144a782b7
commit d94b36c202
1 changed files with 19 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/audio/sampman_oal.cpp
View file

@ -109,9 +109,9 @@ ALuint ALStreamBuffers[MAX_STREAMS][NUM_STREAMBUFFERS];
struct struct
{ {
ALuint buffer; ALuint buffer;
ALuint timer; ALint timer;
bool IsEmpty() { return timer == 0; } bool IsEmpty() { return buffer == 0; }
void Set(ALuint buf) { buffer = buf; } void Set(ALuint buf) { buffer = buf; }
void Wait() { timer = 10000; } void Wait() { timer = 10000; }
void Init() void Init()
@ -121,19 +121,32 @@ struct
} }
void Term() void Term()
{ {
if ( buffer != 0 && alIsBuffer(buffer) ) if (buffer != 0 && alIsBuffer(buffer)) {
alDeleteBuffers(1, &buffer); alDeleteBuffers(1, &buffer);
assert(alGetError() == AL_NO_ERROR);
}
timer = 0; timer = 0;
buffer = 0;
} }
void Update() void Update()
{ {
if ( !(timer > 0) ) return; if ( !(timer > 0) ) return;
timer -= ALuint(CTimer::GetTimeStepInMilliseconds()); timer -= ALint(CTimer::GetTimeStepInMilliseconds());
if ( timer > 0 ) return; if ( timer > 0 ) return;
if ( buffer != 0 && alIsBuffer(buffer) ) timer = 0;
if ( buffer != 0 )
{ {
if (!alIsBuffer(buffer))
{
buffer = 0;
return;
}
alDeleteBuffers(1, &buffer); alDeleteBuffers(1, &buffer);
timer = ( alGetError() == AL_NO_ERROR ) ? 0 : 10000; ALenum error = alGetError();
if (error != AL_NO_ERROR)
timer = 10000;
else
buffer = 0;
} }
} }
}ALBuffers[SAMPLEBANK_MAX]; }ALBuffers[SAMPLEBANK_MAX];