diff options
author | Chris Robinson <[email protected]> | 2017-05-02 04:25:08 -0700 |
---|---|---|
committer | Chris Robinson <[email protected]> | 2017-05-02 04:25:08 -0700 |
commit | 1e5334176eb2bd9bae367218570a5fd24597f827 (patch) | |
tree | 42e0fc695660fbdd3969ed4d8723845ce63b5a9b | |
parent | 2f8d597f4ef3bcdfdad10edac2e9f74ddf3e23ff (diff) |
Rename VOICE_IS_HRTF to VOICE_HAS_HRTF
-rw-r--r-- | Alc/ALu.c | 8 | ||||
-rw-r--r-- | Alc/mixer.c | 2 | ||||
-rw-r--r-- | OpenAL32/Include/alu.h | 2 |
3 files changed, 6 insertions, 6 deletions
@@ -522,7 +522,7 @@ static void CalcNonAttnSourceParams(ALvoice *voice, const struct ALvoiceProps *p break; } - voice->Flags &= ~(VOICE_IS_HRTF | VOICE_HAS_NFC); + voice->Flags &= ~(VOICE_HAS_HRTF | VOICE_HAS_NFC); if(isbformat) { ALfloat N[3], V[3], U[3]; @@ -682,7 +682,7 @@ static void CalcNonAttnSourceParams(ALvoice *voice, const struct ALvoiceProps *p } } - voice->Flags |= VOICE_IS_HRTF; + voice->Flags |= VOICE_HAS_HRTF; } else { @@ -1098,7 +1098,7 @@ static void CalcAttnSourceParams(ALvoice *voice, const struct ALvoiceProps *prop BsincPrepare(voice->Step, &voice->ResampleState.bsinc); voice->Resampler = SelectResampler(props->Resampler); - voice->Flags &= ~(VOICE_IS_HRTF | VOICE_HAS_NFC); + voice->Flags &= ~(VOICE_HAS_HRTF | VOICE_HAS_NFC); if(Device->Render_Mode == HrtfRender) { /* Full HRTF rendering. Skip the virtual channels and render to the @@ -1151,7 +1151,7 @@ static void CalcAttnSourceParams(ALvoice *voice, const struct ALvoiceProps *prop voice->Send[i].Params[0].Gains.Target[j] = 0.0f; } - voice->Flags |= VOICE_IS_HRTF; + voice->Flags |= VOICE_HAS_HRTF; } else { diff --git a/Alc/mixer.c b/Alc/mixer.c index 64a8c1e1..b632d6ca 100644 --- a/Alc/mixer.c +++ b/Alc/mixer.c @@ -445,7 +445,7 @@ ALboolean MixSource(ALvoice *voice, ALsource *Source, ALCdevice *Device, ALsizei &parms->LowPass, &parms->HighPass, Device->FilteredData, ResampledData, DstBufferSize, parms->FilterType ); - if(!(voice->Flags&VOICE_IS_HRTF)) + if(!(voice->Flags&VOICE_HAS_HRTF)) { if(!Counter) memcpy(parms->Gains.Current, parms->Gains.Target, diff --git a/OpenAL32/Include/alu.h b/OpenAL32/Include/alu.h index 76b88a3f..3cb94270 100644 --- a/OpenAL32/Include/alu.h +++ b/OpenAL32/Include/alu.h @@ -223,7 +223,7 @@ struct ALvoiceProps { /* 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_HRTF (1<<1) #define VOICE_HAS_NFC (1<<2) typedef struct ALvoice { |