Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Changed: Additional checks for streaming buffers in OpenAL

Browse source
This commit is contained in:
kaetemi 2012-12-10 13:09:41 +01:00
parent 3b835a5407
commit e32d4cbf1d
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
code/nel/src/sound/driver/openal/buffer_al.cpp
View file

@ -120,7 +120,7 @@ bool CBufferAL::unlock(uint size)
// Error handling // Error handling
if (alGetError() == AL_NO_ERROR) if (alGetError() == AL_NO_ERROR)
_IsLoaded = true; _IsLoaded = true; // ->lock() set it to false
return _IsLoaded; return _IsLoaded;
} }
@ -161,8 +161,7 @@ bool CBufferAL::fill(const uint8 *src, uint size)
alBufferData(_BufferName, _SampleFormat, src, size, _Frequency); alBufferData(_BufferName, _SampleFormat, src, size, _Frequency);
// Error handling // Error handling
if (alGetError() == AL_NO_ERROR) _IsLoaded = (alGetError() == AL_NO_ERROR);
_IsLoaded = true;
return _IsLoaded; return _IsLoaded;
} }

7
code/nel/src/sound/driver/openal/source_al.cpp
View file

@ -162,6 +162,13 @@ void CSourceAL::submitStreamingBuffer(IBuffer *buffer)
CBufferAL *bufferAL = static_cast<CBufferAL *>(buffer); CBufferAL *bufferAL = static_cast<CBufferAL *>(buffer);
ALuint bufferName = bufferAL->bufferName(); ALuint bufferName = bufferAL->bufferName();
nlassert(bufferName); nlassert(bufferName);
if (!bufferAL->isBufferLoaded())
{
nlwarning("AL: Streaming buffer was not loaded, skipping buffer. This should not happen.");
return;
}
alSourceQueueBuffers(_Source, 1, &bufferName); alSourceQueueBuffers(_Source, 1, &bufferName);
alTestError(); alTestError();
_QueuedBuffers.push(bufferAL); _QueuedBuffers.push(bufferAL);