2 files changed, 6 insertions, 7 deletions

diff --git a/Alc/ALc.c b/Alc/ALc.c
index f5f7bbe0..a528aa69 100644
--- a/Alc/ALc.c
+++ b/Alc/ALc.c
@@ -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;
diff --git a/Alc/ALu.c b/Alc/ALu.c
index 36229cfb..659ba52b 100644
--- a/Alc/ALu.c
+++ b/Alc/ALu.c
@@ -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;