From 97f53d941c32b24470a0f589853ce60cfbe7f15b Mon Sep 17 00:00:00 2001 From: Chris Robinson Date: Thu, 15 Oct 2015 07:29:25 -0700 Subject: Store the source's previous samples with the voice This helps avoid different results when looping is toggled within a couple samples of the loop point, or when a processed buffer is removed while the source is only a couple samples into the next buffer. --- OpenAL32/alSource.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'OpenAL32/alSource.c') diff --git a/OpenAL32/alSource.c b/OpenAL32/alSource.c index f5b7111f..f91b3878 100644 --- a/OpenAL32/alSource.c +++ b/OpenAL32/alSource.c @@ -2574,6 +2574,7 @@ ALvoid SetSourceState(ALsource *Source, ALCcontext *Context, ALenum state) { ALCdevice *device = Context->Device; ALbufferlistitem *BufferList; + ALboolean discontinuity; ALvoice *voice = NULL; ALsizei i; @@ -2594,13 +2595,20 @@ ALvoid SetSourceState(ALsource *Source, ALCcontext *Context, ALenum state) Source->position = 0; Source->position_fraction = 0; ATOMIC_STORE(&Source->current_buffer, BufferList); + discontinuity = AL_TRUE; } else + { Source->state = AL_PLAYING; + discontinuity = AL_FALSE; + } // Check if an Offset has been set if(Source->Offset >= 0.0) + { ApplyOffset(Source); + /* discontinuity = AL_TRUE;??? */ + } /* If there's nothing to play, or device is disconnected, go right to * stopped */ @@ -2631,6 +2639,10 @@ ALvoid SetSourceState(ALsource *Source, ALCcontext *Context, ALenum state) voice->Source = Source; } + /* Clear previous samples if playback is discontinuous. */ + if(discontinuity) + memset(voice->PrevSamples, 0, sizeof(voice->PrevSamples)); + voice->Direct.Moving = AL_FALSE; voice->Direct.Counter = 0; for(i = 0;i < MAX_INPUT_CHANNELS;i++) -- cgit v1.2.3