6 files changed, 10 insertions, 10 deletions
diff --git a/alc/effects/autowah.cpp b/alc/effects/autowah.cpp
index de91c32f..5ac51e32 100644
--- a/alc/effects/autowah.cpp
+++ b/alc/effects/autowah.cpp
@@ -52,7 +52,7 @@ struct AutowahState final : public EffectState {
     struct {
         float cos_w0;
         float alpha;
-    } mEnv[BUFFERSIZE];
+    } mEnv[BufferLineSize];
 
     struct {
         /* Effect filters' history. */
@@ -66,7 +66,7 @@ struct AutowahState final : public EffectState {
     } mChans[MAX_AMBI_CHANNELS];
 
     /* Effects buffers */
-    alignas(16) float mBufferOut[BUFFERSIZE];
+    alignas(16) float mBufferOut[BufferLineSize];
 
 
     void deviceUpdate(const ALCdevice *device) override;
diff --git a/alc/effects/chorus.cpp b/alc/effects/chorus.cpp
index 81449b9b..68a79fba 100644
--- a/alc/effects/chorus.cpp
+++ b/alc/effects/chorus.cpp
@@ -109,7 +109,7 @@ void ChorusState::deviceUpdate(const ALCdevice *Device)
 void ChorusState::update(const ALCcontext *Context, const EffectSlot *Slot,
     const EffectProps *props, const EffectTarget target)
 {
-    constexpr ALsizei mindelay{(MAX_RESAMPLER_PADDING>>1) << MixerFracBits};
+    constexpr int mindelay{(MaxResamplerPadding>>1) << MixerFracBits};
 
     switch(props->Chorus.Waveform)
     {
diff --git a/alc/effects/distortion.cpp b/alc/effects/distortion.cpp
index c3c1d241..757244c5 100644
--- a/alc/effects/distortion.cpp
+++ b/alc/effects/distortion.cpp
@@ -43,7 +43,7 @@ struct DistortionState final : public EffectState {
     float mAttenuation{};
     float mEdgeCoeff{};
 
-    float mBuffer[2][BUFFERSIZE]{};
+    float mBuffer[2][BufferLineSize]{};
 
 
     void deviceUpdate(const ALCdevice *device) override;
@@ -101,7 +101,7 @@ void DistortionState::process(const size_t samplesToDo, const al::span<const Flo
          * bandpass filters using high frequencies, at which classic IIR
          * filters became unstable.
          */
-        size_t todo{minz(BUFFERSIZE, (samplesToDo-base) * 4)};
+        size_t todo{minz(BufferLineSize, (samplesToDo-base) * 4)};
 
         /* Fill oversample buffer using zero stuffing. Multiply the sample by
          * the amount of oversampling to maintain the signal's power.
diff --git a/alc/effects/echo.cpp b/alc/effects/echo.cpp
index 70aaf59c..a50d3c61 100644
--- a/alc/effects/echo.cpp
+++ b/alc/effects/echo.cpp
@@ -55,7 +55,7 @@ struct EchoState final : public EffectState {
     BiquadFilter mFilter;
     float mFeedGain{0.0f};
 
-    alignas(16) float mTempBuffer[2][BUFFERSIZE];
+    alignas(16) float mTempBuffer[2][BufferLineSize];
 
     void deviceUpdate(const ALCdevice *device) override;
     void update(const ALCcontext *context, const EffectSlot *slot, const EffectProps *props,
diff --git a/alc/effects/fshifter.cpp b/alc/effects/fshifter.cpp
index da9b0ce2..c1acf08c 100644
--- a/alc/effects/fshifter.cpp
+++ b/alc/effects/fshifter.cpp
@@ -71,9 +71,9 @@ struct FshifterState final : public EffectState {
     complex_d mOutFIFO[HIL_STEP]{};
     complex_d mOutputAccum[HIL_SIZE]{};
     complex_d mAnalytic[HIL_SIZE]{};
-    complex_d mOutdata[BUFFERSIZE]{};
+    complex_d mOutdata[BufferLineSize]{};
 
-    alignas(16) float mBufferOut[BUFFERSIZE]{};
+    alignas(16) float mBufferOut[BufferLineSize]{};
 
     /* Effect gains for each output channel */
     struct {
diff --git a/alc/effects/reverb.cpp b/alc/effects/reverb.cpp
index 78773abf..6471b210 100644
--- a/alc/effects/reverb.cpp
+++ b/alc/effects/reverb.cpp
@@ -562,12 +562,12 @@ void ReverbState::allocLines(const float frequency)
     /* The main delay length includes the maximum early reflection delay, the
      * largest early tap width, the maximum late reverb delay, and the
      * largest late tap width.  Finally, it must also be extended by the
-     * update size (BUFFERSIZE) for block processing.
+     * update size (BufferLineSize) for block processing.
      */
     float length{AL_EAXREVERB_MAX_REFLECTIONS_DELAY + EARLY_TAP_LENGTHS.back()*multiplier +
         AL_EAXREVERB_MAX_LATE_REVERB_DELAY +
         (LATE_LINE_LENGTHS.back() - LATE_LINE_LENGTHS.front())/float{NUM_LINES}*multiplier};
-    totalSamples += mDelay.calcLineLength(length, totalSamples, frequency, BUFFERSIZE);
+    totalSamples += mDelay.calcLineLength(length, totalSamples, frequency, BufferLineSize);
 
     /* The early vector all-pass line. */
     length = EARLY_ALLPASS_LENGTHS.back() * multiplier;