AerialX
/
openal-soft-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename non_virtual_channels to direct_channels

master
Chris Robinson 2012-02-09 23:35:17 -08:00
parent b4b492c417
commit ef68aa39f8
6 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Alc/ALc.c
View File

@ -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;

10
Alc/ALu.c
View File

@ -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;

6
OpenAL32/Include/alMain.h
View File

@ -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

2
OpenAL32/Include/alSource.h
View File

@ -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;

2
OpenAL32/alExtension.c
View File

@ -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 },

14
OpenAL32/alSource.c
View File

@ -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;