aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Alc/ALc.c3
-rw-r--r--Alc/ALu.c10
-rw-r--r--OpenAL32/Include/alMain.h6
-rw-r--r--OpenAL32/Include/alSource.h2
-rw-r--r--OpenAL32/alExtension.c2
-rw-r--r--OpenAL32/alSource.c14
6 files changed, 18 insertions, 19 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;
diff --git a/OpenAL32/Include/alMain.h b/OpenAL32/Include/alMain.h
index 51a28e35..235737c4 100644
--- a/OpenAL32/Include/alMain.h
+++ b/OpenAL32/Include/alMain.h
@@ -49,9 +49,9 @@ ALC_API void ALC_APIENTRY alcRenderSamplesSOFT(ALCdevice *device, ALCvoid *buffe
#endif
#endif
-#ifndef AL_SOFT_non_virtual_channels
-#define AL_SOFT_non_virtual_channels 1
-#define AL_VIRTUAL_CHANNELS_SOFT 0x1033
+#ifndef AL_SOFT_direct_channels
+#define AL_SOFT_direct_channels 1
+#define AL_DIRECT_CHANNELS_SOFT 0x1033
#endif
#ifndef AL_SOFT_deferred_updates
diff --git a/OpenAL32/Include/alSource.h b/OpenAL32/Include/alSource.h
index ee2a5cd1..bed7cfec 100644
--- a/OpenAL32/Include/alSource.h
+++ b/OpenAL32/Include/alSource.h
@@ -46,7 +46,7 @@ typedef struct ALsource
volatile ALboolean bHeadRelative;
volatile ALboolean bLooping;
volatile enum DistanceModel DistanceModel;
- volatile ALboolean VirtualChannels;
+ volatile ALboolean DirectChannels;
enum Resampler Resampler;
diff --git a/OpenAL32/alExtension.c b/OpenAL32/alExtension.c
index 06dee4e2..96c85061 100644
--- a/OpenAL32/alExtension.c
+++ b/OpenAL32/alExtension.c
@@ -75,7 +75,7 @@ static const ALenums enumeration[] = {
{ "AL_STREAMING", AL_STREAMING },
{ "AL_UNDETERMINED", AL_UNDETERMINED },
{ "AL_METERS_PER_UNIT", AL_METERS_PER_UNIT },
- { "AL_VIRTUAL_CHANNELS_SOFT", AL_VIRTUAL_CHANNELS_SOFT },
+ { "AL_DIRECT_CHANNELS_SOFT", AL_DIRECT_CHANNELS_SOFT },
// Source EFX Properties
{ "AL_DIRECT_FILTER", AL_DIRECT_FILTER },
diff --git a/OpenAL32/alSource.c b/OpenAL32/alSource.c
index 982da4c4..eefca756 100644
--- a/OpenAL32/alSource.c
+++ b/OpenAL32/alSource.c
@@ -706,10 +706,10 @@ AL_API ALvoid AL_APIENTRY alSourcei(ALuint source,ALenum eParam,ALint lValue)
alSetError(pContext, AL_INVALID_VALUE);
break;
- case AL_VIRTUAL_CHANNELS_SOFT:
+ case AL_DIRECT_CHANNELS_SOFT:
if(lValue == AL_TRUE || lValue == AL_FALSE)
{
- Source->VirtualChannels = lValue;
+ Source->DirectChannels = lValue;
Source->NeedsUpdate = AL_TRUE;
}
else
@@ -838,7 +838,7 @@ AL_API void AL_APIENTRY alSourceiv(ALuint source, ALenum eParam, const ALint* pl
case AL_AUXILIARY_SEND_FILTER_GAIN_AUTO:
case AL_AUXILIARY_SEND_FILTER_GAINHF_AUTO:
case AL_DISTANCE_MODEL:
- case AL_VIRTUAL_CHANNELS_SOFT:
+ case AL_DIRECT_CHANNELS_SOFT:
alSourcei(source, eParam, plValues[0]);
return;
@@ -1211,8 +1211,8 @@ AL_API ALvoid AL_APIENTRY alGetSourcei(ALuint source, ALenum eParam, ALint *plVa
*plValue = (ALint)Source->DopplerFactor;
break;
- case AL_VIRTUAL_CHANNELS_SOFT:
- *plValue = Source->VirtualChannels;
+ case AL_DIRECT_CHANNELS_SOFT:
+ *plValue = Source->DirectChannels;
break;
case AL_DISTANCE_MODEL:
@@ -1317,7 +1317,7 @@ AL_API void AL_APIENTRY alGetSourceiv(ALuint source, ALenum eParam, ALint* plVal
case AL_AUXILIARY_SEND_FILTER_GAIN_AUTO:
case AL_AUXILIARY_SEND_FILTER_GAINHF_AUTO:
case AL_DISTANCE_MODEL:
- case AL_VIRTUAL_CHANNELS_SOFT:
+ case AL_DIRECT_CHANNELS_SOFT:
alGetSourcei(source, eParam, plValues);
return;
@@ -1824,7 +1824,7 @@ static ALvoid InitSourceParams(ALsource *Source)
Source->AirAbsorptionFactor = 0.0f;
Source->RoomRolloffFactor = 0.0f;
Source->DopplerFactor = 1.0f;
- Source->VirtualChannels = AL_TRUE;
+ Source->DirectChannels = AL_FALSE;
Source->DistanceModel = AL_INVERSE_DISTANCE_CLAMPED;
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-30 02:34:15 +0000