diff options
author | Chris Robinson <[email protected]> | 2012-02-09 23:35:17 -0800 |
---|---|---|
committer | Chris Robinson <[email protected]> | 2012-02-09 23:35:17 -0800 |
commit | ef68aa39f860bf93f6c566f0f5dd98e040cfe5f4 (patch) | |
tree | 7a7ae9ae71f1d8517d67bc4d4f78d7aa7e0131b8 /Alc | |
parent | b4b492c4171616310813316775244705e20c45ca (diff) |
Rename non_virtual_channels to direct_channels
Diffstat (limited to 'Alc')
-rw-r--r-- | Alc/ALc.c | 3 | ||||
-rw-r--r-- | Alc/ALu.c | 10 |
2 files changed, 6 insertions, 7 deletions
@@ -377,8 +377,7 @@ static const ALchar alExtList[] = "AL_EXT_IMA4 AL_EXT_LINEAR_DISTANCE AL_EXT_MCFORMATS AL_EXT_MULAW " "AL_EXT_MULAW_MCFORMATS AL_EXT_OFFSET AL_EXT_source_distance_model " "AL_LOKI_quadriphonic AL_SOFT_buffer_samples AL_SOFT_buffer_sub_data " - "AL_SOFTX_deferred_updates AL_SOFT_loop_points " - "AL_SOFTX_non_virtual_channels"; + "AL_SOFTX_deferred_updates AL_SOFTX_direct_channels AL_SOFT_loop_points"; // Mixing Priority Level ALint RTPrioLevel; @@ -108,7 +108,7 @@ ALvoid CalcNonAttnSourceParams(ALsource *ALSource, const ALCcontext *ALContext) const struct ChanMap *chans = NULL; enum Resampler Resampler; ALint num_channels = 0; - ALboolean VirtualChannels; + ALboolean DirectChannels; ALfloat Pitch; ALfloat cw; ALuint pos; @@ -128,7 +128,7 @@ ALvoid CalcNonAttnSourceParams(ALsource *ALSource, const ALCcontext *ALContext) MaxVolume = ALSource->flMaxGain; Pitch = ALSource->flPitch; Resampler = ALSource->Resampler; - VirtualChannels = ALSource->VirtualChannels; + DirectChannels = ALSource->DirectChannels; /* Calculate the stepping value */ Channels = FmtMono; @@ -159,7 +159,7 @@ ALvoid CalcNonAttnSourceParams(ALsource *ALSource, const ALCcontext *ALContext) } BufferListItem = BufferListItem->next; } - if(VirtualChannels && Device->Hrtf) + if(!DirectChannels && Device->Hrtf) ALSource->Params.DoMix = SelectHrtfMixer((ALSource->Params.Step==FRACTIONONE) ? POINT_RESAMPLER : Resampler); else @@ -190,7 +190,7 @@ ALvoid CalcNonAttnSourceParams(ALsource *ALSource, const ALCcontext *ALContext) num_channels = 1; break; case FmtStereo: - if(VirtualChannels && (Device->Flags&DEVICE_DUPLICATE_STEREO)) + if(!DirectChannels && (Device->Flags&DEVICE_DUPLICATE_STEREO)) { DryGain *= aluSqrt(2.0f/4.0f); for(c = 0;c < 2;c++) @@ -237,7 +237,7 @@ ALvoid CalcNonAttnSourceParams(ALsource *ALSource, const ALCcontext *ALContext) break; } - if(VirtualChannels == AL_FALSE) + if(DirectChannels != AL_FALSE) { for(c = 0;c < num_channels;c++) SrcMatrix[c][chans[c].channel] += DryGain * ListenerGain; |