aboutsummaryrefslogtreecommitdiffstats
path: root/Alc
diff options
context:
space:
mode:
authorChris Robinson <[email protected]>2012-09-08 22:09:34 -0700
committerChris Robinson <[email protected]>2012-09-08 22:09:34 -0700
commit89cab3cd393a8fd9b3fd9e33a19103108258e938 (patch)
tree7fb0c9159daf5fb6c1b8d4983a5ed4b0dfa4d706 /Alc
parent6723d27e06f8fe06876be81d76de5b482e2f9b33 (diff)
Remove STACK_DATA_SIZE in favor of BUFFERSIZE
Diffstat (limited to 'Alc')
-rw-r--r--Alc/ALu.c6
-rw-r--r--Alc/mixer.c4
2 files changed, 4 insertions, 6 deletions
diff --git a/Alc/ALu.c b/Alc/ALu.c
index 4a760833..d7b6025e 100644
--- a/Alc/ALu.c
+++ b/Alc/ALu.c
@@ -151,8 +151,7 @@ ALvoid CalcNonAttnSourceParams(ALsource *ALSource, const ALCcontext *ALContext)
ALbuffer *ALBuffer;
if((ALBuffer=BufferListItem->buffer) != NULL)
{
- ALsizei maxstep = STACK_DATA_SIZE/sizeof(ALfloat) /
- ALSource->NumChannels;
+ ALsizei maxstep = BUFFERSIZE / ALSource->NumChannels;
maxstep -= ResamplerPadding[Resampler] +
ResamplerPrePadding[Resampler] + 1;
maxstep = mini(maxstep, INT_MAX>>FRACTIONBITS);
@@ -645,8 +644,7 @@ ALvoid CalcSourceParams(ALsource *ALSource, const ALCcontext *ALContext)
{
/* Calculate fixed-point stepping value, based on the pitch, buffer
* frequency, and output frequency. */
- ALsizei maxstep = STACK_DATA_SIZE/sizeof(ALfloat) /
- ALSource->NumChannels;
+ ALsizei maxstep = BUFFERSIZE / ALSource->NumChannels;
maxstep -= ResamplerPadding[Resampler] +
ResamplerPrePadding[Resampler] + 1;
maxstep = mini(maxstep, INT_MAX>>FRACTIONBITS);
diff --git a/Alc/mixer.c b/Alc/mixer.c
index affe4a80..d6686402 100644
--- a/Alc/mixer.c
+++ b/Alc/mixer.c
@@ -226,7 +226,7 @@ ALvoid MixSource(ALsource *Source, ALCdevice *Device, ALuint SamplesToDo)
do {
const ALuint BufferPrePadding = ResamplerPrePadding[Resampler];
const ALuint BufferPadding = ResamplerPadding[Resampler];
- ALfloat StackData[STACK_DATA_SIZE/sizeof(ALfloat)];
+ ALfloat StackData[BUFFERSIZE];
ALfloat *SrcData = StackData;
ALuint SrcDataSize = 0;
ALuint BufferSize;
@@ -239,7 +239,7 @@ ALvoid MixSource(ALsource *Source, ALCdevice *Device, ALuint SamplesToDo)
DataSize64 += BufferPadding+BufferPrePadding;
DataSize64 *= NumChannels;
- BufferSize = (ALuint)mini64(DataSize64, STACK_DATA_SIZE/sizeof(ALfloat));
+ BufferSize = (ALuint)mini64(DataSize64, BUFFERSIZE);
BufferSize /= NumChannels;
if(Source->SourceType == AL_STATIC)