diff options
| author | Chris Robinson <[email protected]> | 2017-03-11 06:26:05 -0800 |
|---|---|---|
| committer | Chris Robinson <[email protected]> | 2017-03-11 06:26:05 -0800 |
| commit | feffe1e81a155ded0bcdb519a1a126fd8e908baa (patch) | |
| tree | 3645a30361f0e39bb9a4d40f942ee53d8383bed5 /OpenAL32 | |
| parent | 98e8f941b773df0b591e7c6c6c0e3b5096a9b4f2 (diff) | |
Make the voice's 'moving' state a bitflag
Diffstat (limited to 'OpenAL32')
| -rw-r--r-- | OpenAL32/Include/alu.h | 9 | ||||
| -rw-r--r-- | OpenAL32/alSource.c | 3 |
2 files changed, 5 insertions, 7 deletions
diff --git a/OpenAL32/Include/alu.h b/OpenAL32/Include/alu.h index 6c374ebc..8888bdc0 100644 --- a/OpenAL32/Include/alu.h +++ b/OpenAL32/Include/alu.h @@ -155,8 +155,10 @@ typedef struct SendParams { } Gains; } SendParams; -#define VOICE_IS_HRTF (1<<0) -#define VOICE_HAS_NFC (1<<1) +/* If not 'moving', gain targets are used directly without fading. */ +#define VOICE_IS_MOVING (1<<0) +#define VOICE_IS_HRTF (1<<1) +#define VOICE_HAS_NFC (1<<2) typedef struct ALvoice { struct ALsourceProps *Props; @@ -185,9 +187,6 @@ typedef struct ALvoice { /** Current target parameters used for mixing. */ ALint Step; - /* If not 'moving', gain/coefficients are set directly without fading. */ - ALboolean Moving; - ALuint Flags; ALuint Offset; /* Number of output samples mixed since starting. */ diff --git a/OpenAL32/alSource.c b/OpenAL32/alSource.c index 55a4aae1..a36231b5 100644 --- a/OpenAL32/alSource.c +++ b/OpenAL32/alSource.c @@ -3034,7 +3034,7 @@ ALvoid SetSourceState(ALsource *Source, ALCcontext *Context, ALenum state) * volume last specified; there's no reason to fade from where * it stopped at. */ - voice->Moving = AL_FALSE; + voice->Flags &= ~VOICE_IS_MOVING; ATOMIC_STORE(&voice->Playing, true, almemory_order_release); ATOMIC_STORE(&Source->state, AL_PLAYING, almemory_order_release); goto done; @@ -3083,7 +3083,6 @@ ALvoid SetSourceState(ALsource *Source, ALCcontext *Context, ALenum state) */ voice->Step = 0; - voice->Moving = AL_FALSE; voice->Flags = 0; for(i = 0;i < MAX_INPUT_CHANNELS;i++) { |