AuroraMiddleware/AuroraOpenALSoft
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add a boolean to specify if a voice should be playing

Browse Source
This commit is contained in:
Chris Robinson 2017-03-02 00:49:03 -08:00
parent 0e8ca50d7a
commit 6d7a790183
3 changed files with 53 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Alc/ALu.c
View File

@ -1224,9 +1224,8 @@ static void CalcAttnSourceParams(ALvoice *voice, const struct ALsourceProps *pro
}
}
static void CalcSourceParams(ALvoice *voice, ALCcontext *context, ALboolean force)
static void CalcSourceParams(ALvoice *voice, ALsource *source, ALCcontext *context, ALboolean force)
{
ALsource *source = voice->Source;
const ALbufferlistitem *BufferListItem;
struct ALsourceProps *props;
@ -1278,11 +1277,8 @@ static void UpdateContextSources(ALCcontext *ctx, ALeffectslot *slot)
voice_end = voice + ctx->VoiceCount;
for(;voice != voice_end;++voice)
{
if(!(source=(*voice)->Source)) continue;
if(!IsPlayingOrPaused(source))
(*voice)->Source = NULL;
else
CalcSourceParams(*voice, ctx, force);
if((source=(*voice)->Source) != NULL)
CalcSourceParams(*voice, source, ctx, force);
}
}
IncrementRef(&ctx->UpdateCount);
@ -1423,13 +1419,15 @@ void aluMixData(ALCdevice *device, ALvoid *buffer, ALsizei size)
voice_end = voice + ctx->VoiceCount;
for(;voice != voice_end;++voice)
{
ALboolean IsVoiceInit = ((*voice)->Step > 0);
source = (*voice)->Source;
if(IsVoiceInit && source &&
ATOMIC_LOAD(&source->state, almemory_order_relaxed) == AL_PLAYING)
if(source && ATOMIC_LOAD(&(*voice)->Playing, almemory_order_relaxed) &&
(*voice)->Step > 0)
{
if(!MixSource(*voice, source, device, SamplesToDo))
{
(*voice)->Source = NULL;
ATOMIC_STORE(&(*voice)->Playing, false, almemory_order_release);
}
}
}
@ -1596,6 +1594,7 @@ void aluHandleDisconnect(ALCdevice *device)
{
ALsource *source = (*voice)->Source;
(*voice)->Source = NULL;
ATOMIC_STORE(&(*voice)->Playing, false, almemory_order_release);
if(source)
{

8
OpenAL32/Include/alSource.h
View File

@ -1,13 +1,14 @@
#ifndef _AL_SOURCE_H_
#define _AL_SOURCE_H_
#define MAX_SENDS 16
#define DEFAULT_SENDS 2
#include "bool.h"
#include "alMain.h"
#include "alu.h"
#include "hrtf.h"
#define MAX_SENDS 16
#define DEFAULT_SENDS 2
#ifdef __cplusplus
extern "C" {
#endif
@ -80,6 +81,7 @@ typedef struct ALvoice {
struct ALsourceProps *Props;
struct ALsource *Source;
ATOMIC(bool) Playing;
/* Current buffer queue item being played. */
ATOMIC(ALbufferlistitem*) current_buffer;

54
OpenAL32/alSource.c
View File

@ -1637,8 +1637,11 @@ AL_API ALvoid AL_APIENTRY alDeleteSources(ALsizei n, const ALuint *sources)
FreeThunkEntry(Source->id);
ALCdevice_Lock(device);
voice = GetSourceVoice(Source, context);
if(voice) voice->Source = NULL;
if((voice=GetSourceVoice(Source, context)) != NULL)
{
voice->Source = NULL;
ATOMIC_STORE(&voice->Playing, false, almemory_order_release);
}
ALCdevice_Unlock(device);
DeinitSource(Source, device->NumAuxSends);
@ -2963,6 +2966,8 @@ void UpdateAllSourceProps(ALCcontext *context)
*/
ALvoid SetSourceState(ALsource *Source, ALCcontext *Context, ALenum state)
{
ALCdevice *device = Context->Device;
ALuint refcount;
ALvoice *voice;
WriteLock(&Source->queue_lock);
@ -2994,11 +2999,12 @@ ALvoid SetSourceState(ALsource *Source, ALCcontext *Context, ALenum state)
{
case AL_PLAYING:
assert(voice != NULL);
/* A source that's already playing is restarted. */
/* A source that's already playing is restarted from the beginning. */
ATOMIC_STORE(&voice->current_buffer, BufferList, almemory_order_relaxed);
ATOMIC_STORE(&voice->position, 0, almemory_order_relaxed);
ATOMIC_STORE(&voice->position_fraction, 0, almemory_order_release);
/* fall-through */
goto done;
case AL_PAUSED:
assert(voice != NULL);
/* A source that's paused simply resumes. Make sure it uses the
@ -3006,12 +3012,16 @@ ALvoid SetSourceState(ALsource *Source, ALCcontext *Context, ALenum state)
* it stopped at.
*/
voice->Moving = AL_FALSE;
ATOMIC_STORE(&voice->Playing, true, almemory_order_release);
goto done;
default:
break;
}
Source->NeedsUpdate = AL_FALSE;
UpdateSourceProps(Source, device->NumAuxSends);
/* Make sure this source isn't already active, and if not, look for an
* unused voice to put it in.
*/
@ -3021,22 +3031,20 @@ ALvoid SetSourceState(ALsource *Source, ALCcontext *Context, ALenum state)
if(Context->Voices[i]->Source == NULL)
{
voice = Context->Voices[i];
voice->Source = Source;
break;
}
}
if(voice == NULL)
{
voice = Context->Voices[Context->VoiceCount++];
voice->Source = Source;
}
ATOMIC_STORE(&voice->Playing, false, almemory_order_release);
ATOMIC_THREAD_FENCE(almemory_order_acquire);
/* A source that's not playing or paused has any offset applied when it
* starts playing.
*/
ATOMIC_STORE(&voice->current_buffer, BufferList, almemory_order_relaxed);
ATOMIC_STORE(&voice->position, 0, almemory_order_relaxed);
ATOMIC_STORE(&voice->position_fraction, 0, almemory_order_release);
ATOMIC_STORE(&voice->position_fraction, 0, almemory_order_relaxed);
if(Source->OffsetType != AL_NONE)
ApplyOffset(Source, voice);
@ -3061,19 +3069,30 @@ ALvoid SetSourceState(ALsource *Source, ALCcontext *Context, ALenum state)
}
}
Source->NeedsUpdate = AL_FALSE;
UpdateSourceProps(Source, device->NumAuxSends);
voice->Source = Source;
ATOMIC_STORE(&voice->Playing, true, almemory_order_release);
}
else if(state == AL_PAUSED)
{
ALenum playing = AL_PLAYING;
if((voice=GetSourceVoice(Source, Context)) != NULL)
{
ATOMIC_STORE(&voice->Playing, false, almemory_order_release);
while(((refcount=ATOMIC_LOAD(&device->MixCount, almemory_order_acquire))&1))
althrd_yield();
}
ATOMIC_COMPARE_EXCHANGE_STRONG_SEQ(ALenum, &Source->state, &playing, AL_PAUSED);
}
else if(state == AL_STOPPED)
{
do_stop:
voice = GetSourceVoice(Source, Context);
if(voice) voice->Source = NULL;
if((voice=GetSourceVoice(Source, Context)) != NULL)
{
voice->Source = NULL;
ATOMIC_STORE(&voice->Playing, false, almemory_order_release);
while(((refcount=ATOMIC_LOAD(&device->MixCount, almemory_order_acquire))&1))
althrd_yield();
}
if(ATOMIC_LOAD(&Source->state, almemory_order_acquire) != AL_INITIAL)
ATOMIC_STORE(&Source->state, AL_STOPPED, almemory_order_relaxed);
Source->OffsetType = AL_NONE;
@ -3081,8 +3100,13 @@ ALvoid SetSourceState(ALsource *Source, ALCcontext *Context, ALenum state)
}
else if(state == AL_INITIAL)
{
voice = GetSourceVoice(Source, Context);
if(voice) voice->Source = NULL;
if((voice=GetSourceVoice(Source, Context)) != NULL)
{
voice->Source = NULL;
ATOMIC_STORE(&voice->Playing, false, almemory_order_release);
while(((refcount=ATOMIC_LOAD(&device->MixCount, almemory_order_acquire))&1))
althrd_yield();
}
if(ATOMIC_LOAD(&Source->state, almemory_order_acquire) != AL_INITIAL)
ATOMIC_STORE(&Source->state, AL_INITIAL, almemory_order_relaxed);
Source->OffsetType = AL_NONE;