Dima353/openal-soft
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clear the voice's buffer when detaching from source

Browse Source
This commit is contained in:
Chris Robinson
2019-03-09 13:20:10 -08:00
parent 972a5c0f1d
commit d39cfcc7bb
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Alc/alu.cpp
+4
View File
@@ -1457,6 +1457,8 @@ void ProcessContext(ALCcontext *ctx, const ALsizei SamplesToDo)
if(!MixSource(voice, sid, ctx, SamplesToDo))
{
voice->current_buffer.store(nullptr, std::memory_order_relaxed);
voice->loop_buffer.store(nullptr, std::memory_order_relaxed);
voice->SourceID.store(0u, std::memory_order_relaxed);
voice->Playing.store(false, std::memory_order_release);
SendSourceStoppedEvent(ctx, sid);
@@ -1816,6 +1818,8 @@ void aluHandleDisconnect(ALCdevice *device, const char *msg, ...)
ALuint sid{voice->SourceID.load(std::memory_order_relaxed)};
if(!sid) return;
voice->current_buffer.store(nullptr, std::memory_order_relaxed);
voice->loop_buffer.store(nullptr, std::memory_order_relaxed);
voice->SourceID.store(0u, std::memory_order_relaxed);
voice->Playing.store(false, std::memory_order_release);
/* If the source's voice was playing, it's now effectively stopped
OpenAL32/alSource.cpp
+6
View File
@@ -530,6 +530,8 @@ void FreeSource(ALCcontext *context, ALsource *source)
BackendUniqueLock backlock{*device->Backend};
if(ALvoice *voice{GetSourceVoice(source, context)})
{
voice->current_buffer.store(nullptr, std::memory_order_relaxed);
voice->loop_buffer.store(nullptr, std::memory_order_relaxed);
voice->SourceID.store(0u, std::memory_order_relaxed);
voice->Playing.store(false, std::memory_order_release);
}
@@ -2931,6 +2933,8 @@ AL_API ALvoid AL_APIENTRY alSourceStopv(ALsizei n, const ALuint *sources)
ALvoice *voice{GetSourceVoice(source, context.get())};
if(voice != nullptr)
{
voice->current_buffer.store(nullptr, std::memory_order_relaxed);
voice->loop_buffer.store(nullptr, std::memory_order_relaxed);
voice->SourceID.store(0u, std::memory_order_relaxed);
voice->Playing.store(false, std::memory_order_release);
voice = nullptr;
@@ -2974,6 +2978,8 @@ AL_API ALvoid AL_APIENTRY alSourceRewindv(ALsizei n, const ALuint *sources)
ALvoice *voice{GetSourceVoice(source, context.get())};
if(voice != nullptr)
{
voice->current_buffer.store(nullptr, std::memory_order_relaxed);
voice->loop_buffer.store(nullptr, std::memory_order_relaxed);
voice->SourceID.store(0u, std::memory_order_relaxed);
voice->Playing.store(false, std::memory_order_release);
voice = nullptr;