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

Fixed: ugly fix to not crash when we cannot create a buffer #1116

Browse source
This commit is contained in:
vl 2011-06-01 00:04:11 +02:00
parent 23f89c8d90
commit d2bc4b288a
1 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -890,15 +890,22 @@ void CSourceAL::setStreamingBuffersMax(uint buffers)
unqueueBuffers(); unqueueBuffers();
removeBuffers(); removeBuffers();
for(uint i = 0; i < _BuffersMax; ++i) for(uint i = 0; i < _BuffersMax; ++i)
{ {
// create a new buffer try {
CBufferAL *buffer = static_cast<CBufferAL*>(_SoundDriver->createBuffer()); // create a new buffer
// use StorageSoftware because buffers will be reused CBufferAL *buffer = static_cast<CBufferAL*>(_SoundDriver->createBuffer());
// deleting and recreating them is a waste of time // use StorageSoftware because buffers will be reused
buffer->setStorageMode(IBuffer::StorageSoftware); // deleting and recreating them is a waste of time
_Buffers[buffer->bufferName()] = buffer; buffer->setStorageMode(IBuffer::StorageSoftware);
} _Buffers[buffer->bufferName()] = buffer;
} catch(ESoundDriverGenBuf &e) {
nlwarning("Cannot create %d buffers. openal fails after %d buffers", buffers, i);
_BuffersMax = i;
_BuffersName.resize(i);
break;
}
}
} }
/// Set the default size for streaming buffers /// Set the default size for streaming buffers