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

Lock the source queue for writing when updating the playback offset

Browse Source
This commit is contained in:
Chris Robinson
2015-10-24 16:31:28 -07:00
parent 298fdb220d
commit a57fe89050
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Alc/ALc.c
+2 -2
View File
@@ -1608,9 +1608,9 @@ void ALCcontext_ProcessUpdates(ALCcontext *context)
if((Source->state == AL_PLAYING || Source->state == AL_PAUSED) &&
Source->Offset >= 0.0)
{
ReadLock(&Source->queue_lock);
WriteLock(&Source->queue_lock);
ApplyOffset(Source);
ReadUnlock(&Source->queue_lock);
WriteUnlock(&Source->queue_lock);
}
new_state = Source->new_state;
OpenAL32/alSource.c
+8 -8
View File
@@ -494,14 +494,14 @@ static ALboolean SetSourcefv(ALsource *Source, ALCcontext *Context, SourceProp p
if((Source->state == AL_PLAYING || Source->state == AL_PAUSED) &&
!Context->DeferUpdates)
{
ReadLock(&Source->queue_lock);
WriteLock(&Source->queue_lock);
if(ApplyOffset(Source) == AL_FALSE)
{
ReadUnlock(&Source->queue_lock);
WriteUnlock(&Source->queue_lock);
UnlockContext(Context);
SET_ERROR_AND_RETURN_VALUE(Context, AL_INVALID_VALUE, AL_FALSE);
}
ReadUnlock(&Source->queue_lock);
WriteUnlock(&Source->queue_lock);
}
UnlockContext(Context);
return AL_TRUE;
@@ -676,14 +676,14 @@ static ALboolean SetSourceiv(ALsource *Source, ALCcontext *Context, SourceProp p
if((Source->state == AL_PLAYING || Source->state == AL_PAUSED) &&
!Context->DeferUpdates)
{
ReadLock(&Source->queue_lock);
WriteLock(&Source->queue_lock);
if(ApplyOffset(Source) == AL_FALSE)
{
ReadUnlock(&Source->queue_lock);
WriteUnlock(&Source->queue_lock);
UnlockContext(Context);
SET_ERROR_AND_RETURN_VALUE(Context, AL_INVALID_VALUE, AL_FALSE);
}
ReadUnlock(&Source->queue_lock);
WriteUnlock(&Source->queue_lock);
}
UnlockContext(Context);
return AL_TRUE;
@@ -2569,7 +2569,7 @@ static ALvoid InitSourceParams(ALsource *Source)
*/
ALvoid SetSourceState(ALsource *Source, ALCcontext *Context, ALenum state)
{
ReadLock(&Source->queue_lock);
WriteLock(&Source->queue_lock);
if(state == AL_PLAYING)
{
ALCdevice *device = Context->Device;
@@ -2695,7 +2695,7 @@ ALvoid SetSourceState(ALsource *Source, ALCcontext *Context, ALenum state)
}
Source->Offset = -1.0;
}
ReadUnlock(&Source->queue_lock);
WriteUnlock(&Source->queue_lock);
}
/* GetSourceSampleOffset