summaryrefslogtreecommitdiffstats
path: root/Alc
diff options
context:
space:
mode:
authorChris Robinson <[email protected]>2010-11-28 13:08:51 -0800
committerChris Robinson <[email protected]>2010-11-28 13:08:51 -0800
commit0e748d98d5db22d259e0803f5318fb61bc7e9c2e (patch)
tree748f04683808db3a8d315e1398d241a9f3589c8e /Alc
parentc41e893361f4c912b8c6c4c703bf7590c957318d (diff)
Rename some stuff for consistency
Diffstat (limited to 'Alc')
-rw-r--r--Alc/ALu.c4
-rw-r--r--Alc/mixer.c6
2 files changed, 5 insertions, 5 deletions
diff --git a/Alc/ALu.c b/Alc/ALu.c
index 3a635826..83571f50 100644
--- a/Alc/ALu.c
+++ b/Alc/ALu.c
@@ -120,7 +120,7 @@ ALvoid CalcNonAttnSourceParams(ALsource *ALSource, const ALCcontext *ALContext)
ResamplerPrePadding[ALSource->Resampler] + 1;
maxstep = min(maxstep, INT_MAX>>FRACTIONBITS);
- Pitch = Pitch * ALBuffer->frequency / Frequency;
+ Pitch = Pitch * ALBuffer->Frequency / Frequency;
if(Pitch > (ALfloat)maxstep)
ALSource->Params.Step = maxstep<<FRACTIONBITS;
else
@@ -598,7 +598,7 @@ ALvoid CalcSourceParams(ALsource *ALSource, const ALCcontext *ALContext)
ResamplerPrePadding[ALSource->Resampler] + 1;
maxstep = min(maxstep, INT_MAX>>FRACTIONBITS);
- Pitch = Pitch * ALBuffer->frequency / Frequency;
+ Pitch = Pitch * ALBuffer->Frequency / Frequency;
if(Pitch > (ALfloat)maxstep)
ALSource->Params.Step = maxstep<<FRACTIONBITS;
else
diff --git a/Alc/mixer.c b/Alc/mixer.c
index 76ae9d86..cc9e4496 100644
--- a/Alc/mixer.c
+++ b/Alc/mixer.c
@@ -635,17 +635,17 @@ static void Mix_##T##_##sampler(ALsource *Source, ALCdevice *Device, \
Data, DataPosInt, DataPosFrac, \
OutPos, SamplesToDo, BufferSize); \
break; \
- case Fmt51ChanWFX: \
+ case FmtX51: \
Mix_##T##_X51Chans_##sampler(Source, Device, \
Data, DataPosInt, DataPosFrac, \
OutPos, SamplesToDo, BufferSize); \
break; \
- case Fmt61ChanWFX: \
+ case FmtX61: \
Mix_##T##_X61Chans_##sampler(Source, Device, \
Data, DataPosInt, DataPosFrac, \
OutPos, SamplesToDo, BufferSize); \
break; \
- case Fmt71ChanWFX: \
+ case FmtX71: \
Mix_##T##_X71Chans_##sampler(Source, Device, \
Data, DataPosInt, DataPosFrac, \
OutPos, SamplesToDo, BufferSize); \