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

Use available buffer samples when pausing a source

master
Chris Robinson 2019-05-05 01:51:46 -07:00
parent 0759ed7213
commit 8d437a5135
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Alc/mixvoice.cpp
View File

@ -555,7 +555,7 @@ void MixVoice(ALvoice *voice, ALvoice::State vstate, const ALuint SourceID, ALCc
std::fill(srciter, std::end(SrcData), 0.0f);
auto srcdata_end = std::begin(SrcData) + SrcBufferSize;
if(vstate != ALvoice::Playing)
if(!BufferListItem)
srciter = std::copy(voice->mPrevSamples[chan].begin()+MAX_RESAMPLE_PADDING,
voice->mPrevSamples[chan].end(), srciter);
else if(isstatic)
@ -787,9 +787,9 @@ void MixVoice(ALvoice *voice, ALvoice::State vstate, const ALuint SourceID, ALCc
OutPos += DstBufferSize;
Counter = maxi(DstBufferSize, Counter) - DstBufferSize;
if(UNLIKELY(vstate != ALvoice::Playing))
if(UNLIKELY(!BufferListItem))
{
/* Do nothing extra for fading out. */
/* Do nothing extra when there's no buffers. */
}
else if(isstatic)
{
@ -810,7 +810,8 @@ void MixVoice(ALvoice *voice, ALvoice::State vstate, const ALuint SourceID, ALCc
/* Handle non-looping static source */
if(DataPosInt >= BufferListItem->max_samples)
{
vstate = ALvoice::Stopped;
if(LIKELY(vstate == ALvoice::Playing))
vstate = ALvoice::Stopped;
BufferListItem = nullptr;
break;
}
@ -828,7 +829,8 @@ void MixVoice(ALvoice *voice, ALvoice::State vstate, const ALuint SourceID, ALCc
BufferListItem = BufferListItem->next.load(std::memory_order_relaxed);
if(!BufferListItem && !(BufferListItem=BufferLoopItem))
{
vstate = ALvoice::Stopped;
if(LIKELY(vstate == ALvoice::Playing))
vstate = ALvoice::Stopped;
break;
}
}