Substitute/Re3
Substitute/Re3
1
0
Fork 0
Code Issues 2 Pull Requests Projects Releases Wiki Activity

oal update

Browse Source
This commit is contained in:
Fire-Head 2020-05-07 10:13:59 +03:00
parent 35da74e0b4
commit 875c77e8b1
1 changed files with 32 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
src/audio/sampman_oal.cpp
View File

@ -88,6 +88,32 @@ struct
{ {
ALuint buffer; ALuint buffer;
ALuint timer; ALuint timer;
bool IsEmpty() { return timer == 0; }
void Set(ALuint buf) { buffer = buf; }
void Wait() { timer = 10000; }
void Init()
{
buffer = 0;
timer = 0;
}
void Term()
{
if ( buffer != 0 && alIsBuffer(buffer) )
alDeleteBuffers(1, &buffer);
timer = 0;
}
void Update()
{
if ( !(timer > 0) ) return;
timer -= ALuint(CTimer::GetTimeStepInMilliseconds());
if ( timer > 0 ) return;
if ( buffer != 0 && alIsBuffer(buffer) )
{
alDeleteBuffers(1, &buffer);
timer = ( alGetError() == AL_NO_ERROR ) ? 0 : 10000;
}
}
}ALBuffers[SAMPLEBANK_MAX]; }ALBuffers[SAMPLEBANK_MAX];
uint32 nNumMP3s; uint32 nNumMP3s;
@ -222,10 +248,7 @@ release_existing()
for ( int32 i = 0; i < SAMPLEBANK_MAX; i++ ) for ( int32 i = 0; i < SAMPLEBANK_MAX; i++ )
{ {
if ( ALBuffers[i].buffer != 0 && alIsBuffer(ALBuffers[i].buffer) ) ALBuffers[i].Term();
alDeleteBuffers(1, &ALBuffers[i].buffer);
ALBuffers[i].timer = 0;
} }
if ( ALContext ) if ( ALContext )
@ -309,8 +332,7 @@ set_new_provider(int index)
for ( int32 i = 0; i < SAMPLEBANK_MAX; i++ ) for ( int32 i = 0; i < SAMPLEBANK_MAX; i++ )
{ {
ALBuffers[i].buffer = 0; ALBuffers[i].Init();
ALBuffers[i].timer = 0;
} }
alGenBuffers(MAX_PEDSFX, pedBuffers); alGenBuffers(MAX_PEDSFX, pedBuffers);
@ -640,23 +662,7 @@ cSampleManager::UpdateSoundBuffers(void)
{ {
for ( int32 i = 0; i < SAMPLEBANK_MAX; i++ ) for ( int32 i = 0; i < SAMPLEBANK_MAX; i++ )
{ {
if ( ALBuffers[i].timer > 0 ) ALBuffers[i].Update();
{
ALBuffers[i].timer -= ALuint(CTimer::GetTimeStepInMilliseconds());
if ( ALBuffers[i].timer <= 0 )
{
if ( ALBuffers[i].buffer != 0 && alIsBuffer(ALBuffers[i].buffer) )
{
alDeleteBuffers(1, &ALBuffers[i].buffer);
if ( alGetError() == AL_NO_ERROR )
ALBuffers[i].timer = 0;
else
ALBuffers[i].timer = 10000;
}
}
}
} }
} }
@ -981,15 +987,14 @@ cSampleManager::InitialiseChannel(uint32 nChannel, uint32 nSfx, uint8 nBank)
int32 addr = nSampleBankMemoryStartAddress[nBank] + m_aSamples[nSfx].nOffset - m_aSamples[BankStartOffset[nBank]].nOffset; int32 addr = nSampleBankMemoryStartAddress[nBank] + m_aSamples[nSfx].nOffset - m_aSamples[BankStartOffset[nBank]].nOffset;
if ( ALBuffers[nSfx].timer == 0 ) if ( ALBuffers[nSfx].IsEmpty() )
{ {
ALuint buf; ALuint buf;
alGenBuffers(1, &buf); alGenBuffers(1, &buf);
alBufferData(buf, AL_FORMAT_MONO16, (void *)addr, m_aSamples[nSfx].nSize, m_aSamples[nSfx].nFrequency); alBufferData(buf, AL_FORMAT_MONO16, (void *)addr, m_aSamples[nSfx].nSize, m_aSamples[nSfx].nFrequency);
ALBuffers[nSfx].buffer = buf; ALBuffers[nSfx].Set(buf);
ALBuffers[nSfx].timer = 10000;
} }
ALBuffers[nSfx].Wait();
buffer = ALBuffers[nSfx].buffer; buffer = ALBuffers[nSfx].buffer;
} }