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

Use a new voice when restarting a playing source

Browse Source
This commit is contained in:
Chris Robinson
2019-09-06 21:20:20 -07:00
parent e5c9643dd5
commit 987fd13796
1 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
al/source.cpp
+18 -10
View File
@@ -2716,14 +2716,6 @@ START_API_FUNC
ALvoice *voice{GetSourceVoice(source, context.get())};
switch(GetSourceState(source, voice))
{
case AL_PLAYING:
assert(voice != nullptr);
/* A source that's already playing is restarted from the beginning. */
voice->mCurrentBuffer.store(BufferList, std::memory_order_relaxed);
voice->mPosition.store(0u, std::memory_order_relaxed);
voice->mPositionFrac.store(0, std::memory_order_release);
return;
case AL_PAUSED:
assert(voice != nullptr);
/* A source that's paused simply resumes. */
@@ -2732,6 +2724,19 @@ START_API_FUNC
SendStateChangeEvent(context.get(), source->id, AL_PLAYING);
return;
case AL_PLAYING:
assert(voice != nullptr);
/* A source that's already playing is restarted from the beginning.
* Stop the current voice and start a new one so it properly cross-
* fades back to the beginning.
*/
voice->mCurrentBuffer.store(nullptr, std::memory_order_relaxed);
voice->mLoopBuffer.store(nullptr, std::memory_order_relaxed);
voice->mSourceID.store(0u, std::memory_order_release);
voice->mPlayState.store(ALvoice::Stopping, std::memory_order_release);
voice = nullptr;
break;
default:
assert(voice == nullptr);
break;
@@ -2851,10 +2856,13 @@ START_API_FUNC
voice->mSourceID.store(source->id, std::memory_order_relaxed);
voice->mPlayState.store(ALvoice::Playing, std::memory_order_release);
source->state = AL_PLAYING;
source->VoiceIdx = vidx;
SendStateChangeEvent(context.get(), source->id, AL_PLAYING);
if(source->state != AL_PLAYING)
{
source->state = AL_PLAYING;
SendStateChangeEvent(context.get(), source->id, AL_PLAYING);
}
};
std::for_each(srchandles, srchandles+n, start_source);
}