From 2f8d597f4ef3bcdfdad10edac2e9f74ddf3e23ff Mon Sep 17 00:00:00 2001
From: Chris Robinson <chris.kcat@gmail.com>
Date: Tue, 2 May 2017 04:09:01 -0700
Subject: [PATCH] Rename 'moving' flag to 'fading'

---
 Alc/mixer.c            |  4 ++--
 OpenAL32/Include/alu.h |  4 ++--
 OpenAL32/alSource.c    | 10 +++++-----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Alc/mixer.c b/Alc/mixer.c
index e8d04bc2..64a8c1e1 100644
--- a/Alc/mixer.c
+++ b/Alc/mixer.c
@@ -296,7 +296,7 @@ ALboolean MixSource(ALvoice *voice, ALsource *Source, ALCdevice *Device, ALsizei
     Resample = ((increment == FRACTIONONE && DataPosFrac == 0) ?
                 Resample_copy32_C : voice->Resampler);
 
-    Counter = (voice->Flags&VOICE_IS_MOVING) ? SamplesToDo : 0;
+    Counter = (voice->Flags&VOICE_IS_FADING) ? SamplesToDo : 0;
     firstpass = true;
     OutPos = 0;
 
@@ -663,7 +663,7 @@ ALboolean MixSource(ALvoice *voice, ALsource *Source, ALCdevice *Device, ALsizei
         }
     } while(isplaying && OutPos < SamplesToDo);
 
-    voice->Flags |= VOICE_IS_MOVING;
+    voice->Flags |= VOICE_IS_FADING;
 
     /* Update source info */
     ATOMIC_STORE(&voice->position,          DataPosInt, almemory_order_relaxed);
diff --git a/OpenAL32/Include/alu.h b/OpenAL32/Include/alu.h
index c6706bad..76b88a3f 100644
--- a/OpenAL32/Include/alu.h
+++ b/OpenAL32/Include/alu.h
@@ -221,8 +221,8 @@ struct ALvoiceProps {
     } Send[];
 };
 
-/* If not 'moving', gain targets are used directly without fading. */
-#define VOICE_IS_MOVING (1<<0)
+/* If not 'fading', gain targets are used directly without fading. */
+#define VOICE_IS_FADING (1<<0)
 #define VOICE_IS_HRTF   (1<<1)
 #define VOICE_HAS_NFC   (1<<2)
 
diff --git a/OpenAL32/alSource.c b/OpenAL32/alSource.c
index 3720ce49..a1ba0ebc 100644
--- a/OpenAL32/alSource.c
+++ b/OpenAL32/alSource.c
@@ -2438,7 +2438,7 @@ AL_API ALvoid AL_APIENTRY alSourcePlayv(ALsizei n, const ALuint *sources)
     {
         ALbufferlistitem *BufferList;
         ALbuffer *buffer = NULL;
-        bool start_moving = false;
+        bool start_fading = false;
         ALsizei s;
 
         source = LookupSource(context, sources[i]);
@@ -2481,11 +2481,11 @@ AL_API ALvoid AL_APIENTRY alSourcePlayv(ALsizei n, const ALuint *sources)
             case AL_PAUSED:
                 assert(voice != NULL);
                 /* A source that's paused simply resumes. Clear its mixing
-                 * parameters and mark it as 'moving' so it fades in from
+                 * parameters and mark it as 'fading' so it fades in from
                  * silence.
                  */
                 voice->Step = 0;
-                voice->Flags |= VOICE_IS_MOVING;
+                voice->Flags |= VOICE_IS_FADING;
                 memset(voice->Direct.Params, 0, sizeof(voice->Direct.Params[0])*
                                                 voice->NumChannels);
                 for(s = 0;s < device->NumAuxSends;s++)
@@ -2531,7 +2531,7 @@ AL_API ALvoid AL_APIENTRY alSourcePlayv(ALsizei n, const ALuint *sources)
         if(source->OffsetType != AL_NONE)
         {
             ApplyOffset(source, voice);
-            start_moving = ATOMIC_LOAD(&voice->position, almemory_order_relaxed) != 0 ||
+            start_fading = ATOMIC_LOAD(&voice->position, almemory_order_relaxed) != 0 ||
                 ATOMIC_LOAD(&voice->position_fraction, almemory_order_relaxed) != 0 ||
                 ATOMIC_LOAD(&voice->current_buffer, almemory_order_relaxed) != BufferList;
         }
@@ -2547,7 +2547,7 @@ AL_API ALvoid AL_APIENTRY alSourcePlayv(ALsizei n, const ALuint *sources)
          */
         voice->Step = 0;
 
-        voice->Flags = start_moving ? VOICE_IS_MOVING : 0;
+        voice->Flags = start_fading ? VOICE_IS_FADING : 0;
         memset(voice->Direct.Params, 0, sizeof(voice->Direct.Params[0])*voice->NumChannels);
         for(s = 0;s < device->NumAuxSends;s++)
             memset(voice->Send[s].Params, 0, sizeof(voice->Send[s].Params[0])*voice->NumChannels);
-- 
2.11.4.GIT