avoid symbol collision with fdk-aac

This is just a quick hack. We should move all Mixxx code into the mixxx
namespace.

1 files changed, 6 insertions, 6 deletions

diff --git a/src/vinylcontrol/vinylcontrolxwax.cpp b/src/vinylcontrol/vinylcontrolxwax.cpp
index 2919d6642b..70b61ee03d 100644
--- a/src/vinylcontrol/vinylcontrolxwax.cpp
+++ b/src/vinylcontrol/vinylcontrolxwax.cpp
@@ -21,7 +21,7 @@ constexpr int kChannels = 2;
 } // namespace
 
 // Sample threshold below which we consider there to be no signal.
-const double kMinSignal = 75.0 / SAMPLE_MAX;
+const double kMinSignal = 75.0 / SAMPLE_MAXIMUM;
 
 bool VinylControlXwax::s_bLUTInitialized = false;
 QMutex VinylControlXwax::s_xwaxLUTMutex;
@@ -208,12 +208,12 @@ void VinylControlXwax::analyzeSamples(CSAMPLE* pSamples, size_t nFrames) {
 
     // Convert CSAMPLE samples to shorts, preventing overflow.
     for (int i = 0; i < static_cast<int>(samplesSize); ++i) {
-        CSAMPLE sample = pSamples[i] * gain * SAMPLE_MAX;
+        CSAMPLE sample = pSamples[i] * gain * SAMPLE_MAXIMUM;
 
-        if (sample > SAMPLE_MAX) {
-            m_pWorkBuffer[i] = SAMPLE_MAX;
-        } else if (sample < SAMPLE_MIN) {
-            m_pWorkBuffer[i] = SAMPLE_MIN;
+        if (sample > SAMPLE_MAXIMUM) {
+            m_pWorkBuffer[i] = SAMPLE_MAXIMUM;
+        } else if (sample < SAMPLE_MINIMUM) {
+            m_pWorkBuffer[i] = SAMPLE_MINIMUM;
         } else {
             m_pWorkBuffer[i] = static_cast<short>(sample);
         }