Mirrors/openrw
1
0
Fork 0
mirror of https://github.com/rwengine/openrw.git synced 2024-09-04 01:29:45 +02:00
Code Issues Projects Releases Activity

Wrap more openAl code with error checking and unqueue buffers before

Browse Source 
delete them
This commit is contained in:
Filip Gawin 2019-04-16 19:49:55 +02:00
parent 1d6290f605
commit 1b588da1d1
1 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
rwengine/src/audio/SoundBufferStreamed.cpp
View File

@ -1,4 +1,4 @@
#include "audio/SoundBufferStreamed.hpp" #include "audio/SoundBufferStreamed.hpp"
#include <rw/types.hpp> #include <rw/types.hpp>
@ -18,13 +18,14 @@ SoundBufferStreamed::SoundBufferStreamed() {
} }
SoundBufferStreamed::~SoundBufferStreamed() { SoundBufferStreamed::~SoundBufferStreamed() {
alCheck(alSourceUnqueueBuffers(source, kNrBuffersStreaming, buffers.data()));
alCheck(alDeleteBuffers(kNrBuffersStreaming, buffers.data())); alCheck(alDeleteBuffers(kNrBuffersStreaming, buffers.data()));
} }
bool SoundBufferStreamed::bufferData(SoundSource &soundSource) { bool SoundBufferStreamed::bufferData(SoundSource &soundSource) {
/* Rewind the source position and clear the buffer queue */ /* Rewind the source position and clear the buffer queue */
alSourceRewind(source); alCheck(alSourceRewind(source));
alSourcei(source, AL_BUFFER, 0); alCheck(alSourcei(source, AL_BUFFER, 0));
std::lock_guard<std::mutex> lock(soundSource.mutex); std::lock_guard<std::mutex> lock(soundSource.mutex);
/* Fill the buffer queue */ /* Fill the buffer queue */
@ -43,7 +44,7 @@ bool SoundBufferStreamed::bufferData(SoundSource &soundSource) {
streamedData++; streamedData++;
} }
alSourceQueueBuffers(source, kNrBuffersStreaming, buffers.data()); alCheck(alSourceQueueBuffers(source, kNrBuffersStreaming, buffers.data()));
this->soundSource = &soundSource; this->soundSource = &soundSource;
@ -65,8 +66,8 @@ void SoundBufferStreamed::updateBuffers() {
ALint processed, state; ALint processed, state;
/* Get relevant source info */ /* Get relevant source info */
alGetSourcei(source, AL_SOURCE_STATE, &state); alCheck(alGetSourcei(source, AL_SOURCE_STATE, &state));
alGetSourcei(source, AL_BUFFERS_PROCESSED, &processed); alCheck(alGetSourcei(source, AL_BUFFERS_PROCESSED, &processed));
std::lock_guard<std::mutex> lock(soundSource->mutex); std::lock_guard<std::mutex> lock(soundSource->mutex);
bool bufferedData = false; bool bufferedData = false;
@ -81,18 +82,19 @@ void SoundBufferStreamed::updateBuffers() {
soundSource->data.size() - soundSource->data.size() -
static_cast<size_t>(kSizeOfChunk) * streamedData); static_cast<size_t>(kSizeOfChunk) * streamedData);
alSourceUnqueueBuffers(source, 1, &bufid); alCheck(alSourceUnqueueBuffers(source, 1, &bufid));
processed--; processed--;
if (sizeOfNextChunk > 0) { if (sizeOfNextChunk > 0) {
alBufferData(bufid, alCheck(alBufferData(
bufid,
soundSource->channels == 1 ? AL_FORMAT_MONO16 soundSource->channels == 1 ? AL_FORMAT_MONO16
: AL_FORMAT_STEREO16, : AL_FORMAT_STEREO16,
&soundSource->data[streamedData * kSizeOfChunk], &soundSource->data[streamedData * kSizeOfChunk],
sizeOfNextChunk * sizeof(int16_t), sizeOfNextChunk * sizeof(int16_t),
soundSource->sampleRate); soundSource->sampleRate));
streamedData++; streamedData++;
alSourceQueueBuffers(source, 1, &bufid); alCheck(alSourceQueueBuffers(source, 1, &bufid));
} }
} }
@ -101,10 +103,10 @@ void SoundBufferStreamed::updateBuffers() {
ALint queued; ALint queued;
/* If no buffers are queued, playback is finished */ /* If no buffers are queued, playback is finished */
alGetSourcei(source, AL_BUFFERS_QUEUED, &queued); alCheck(alGetSourcei(source, AL_BUFFERS_QUEUED, &queued));
if (queued == 0) return; if (queued == 0) return;
alSourcePlay(source); alCheck(alSourcePlay(source));
} }
} }
} }