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 /OpenAL32 | |
| parent | b4b492c4171616310813316775244705e20c45ca (diff) | |
Rename non_virtual_channels to direct_channels
Diffstat (limited to 'OpenAL32')
| -rw-r--r-- | OpenAL32/Include/alMain.h | 6 | ||||
| -rw-r--r-- | OpenAL32/Include/alSource.h | 2 | ||||
| -rw-r--r-- | OpenAL32/alExtension.c | 2 | ||||
| -rw-r--r-- | OpenAL32/alSource.c | 14 |
4 files changed, 12 insertions, 12 deletions
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; |