1 files changed, 15 insertions, 16 deletions
diff --git a/Alc/ALu.c b/Alc/ALu.c
index b4938152..0a1b919a 100644
--- a/Alc/ALu.c
+++ b/Alc/ALu.c
@@ -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);
@@ -1332,24 +1328,24 @@ static void Write_##T(const ALfloatBUFFERSIZE *InBuffer, ALvoid *OutBuffer,   \
         T *restrict out = (T*)OutBuffer + j;                                  \
         const ALfloat gain = distcomp[j].Gain;                                \
         const ALsizei base = distcomp[j].Length;                              \
+        ALfloat *restrict distbuf = ASSUME_ALIGNED(distcomp[j].Buffer, 16);   \
         if(base > 0 || gain != 1.0f)                                          \
         {                                                                     \
             if(SamplesToDo >= base)                                           \
             {                                                                 \
                 for(i = 0;i < base;i++)                                       \
-                    out[i*numchans] = func(distcomp[j].Buffer[i]*gain);       \
+                    out[i*numchans] = func(distbuf[i]*gain);                  \
                 for(;i < SamplesToDo;i++)                                     \
                     out[i*numchans] = func(in[i-base]*gain);                  \
-                memcpy(distcomp[j].Buffer, &in[SamplesToDo-base],             \
-                        base*sizeof(ALfloat));                                \
+                memcpy(distbuf, &in[SamplesToDo-base], base*sizeof(ALfloat)); \
             }                                                                 \
             else                                                              \
             {                                                                 \
                 for(i = 0;i < SamplesToDo;i++)                                \
-                    out[i*numchans] = func(distcomp[j].Buffer[i]*gain);       \
-                memmove(distcomp[j].Buffer, distcomp[j].Buffer+SamplesToDo,   \
+                    out[i*numchans] = func(distbuf[i]*gain);                  \
+                memmove(distbuf, distbuf+SamplesToDo,                         \
                         (base-SamplesToDo)*sizeof(ALfloat));                  \
-                memcpy(distcomp[j].Buffer+base-SamplesToDo, in,               \
+                memcpy(distbuf+base-SamplesToDo, in,                          \
                         SamplesToDo*sizeof(ALfloat));                         \
             }                                                                 \
         }                                                                     \
@@ -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)
             {