Fix RPMFusion builds for armv7hl/ppc64le/aarch64

src/effects/builtin/autopaneffect.cpp

@@ -147,7 +147,7 @@ void AutoPanEffect::processChannel(
     double sinusoid = 0;
 
     // NOTE: Assuming engine is working in stereo.
-    for (unsigned int i = 0; i + 1 < bufferParameters.samplesPerBuffer(); i += 2) {
+    for (SINT i = 0; i + 1 < bufferParameters.samplesPerBuffer(); i += 2) {
         const auto periodFraction = static_cast<CSAMPLE>(gs.time) / static_cast<CSAMPLE>(period);
 
         // current quarter in the trigonometric circle

src/effects/builtin/balanceeffect.h

@@ -20,7 +20,7 @@ class BalanceGroupState : public EffectState {
 
     mixxx::SampleBuffer m_pHighBuf;
 
-    unsigned int m_oldSampleRate;
+    mixxx::audio::SampleRate m_oldSampleRate;
     int m_freq;
 
     CSAMPLE m_oldBalance;

src/effects/builtin/biquadfullkilleqeffect.h

@@ -52,10 +52,10 @@ class BiquadFullKillEQEffectGroupState : public EffectState {
     double m_loFreqCorner;
     double m_highFreqCorner;
 
-    int m_rampHoldOff;
-    int m_groupDelay;
+    SINT m_rampHoldOff;
+    SINT m_groupDelay;
 
-    unsigned int m_oldSampleRate;
+    mixxx::audio::SampleRate m_oldSampleRate;
 };
 
 class BiquadFullKillEQEffect : public EffectProcessorImpl<BiquadFullKillEQEffectGroupState> {

src/effects/builtin/bitcrushereffect.cpp

@@ -88,7 +88,7 @@ void BitCrusherEffect::processChannel(const ChannelHandle& handle,
     // rarely used, to achieve equal loudness and maximum dynamic
     const CSAMPLE gainCorrection = (17 - bit_depth) / 8;
 
-    for (unsigned int i = 0;
+    for (SINT i = 0;
             i < bufferParameters.samplesPerBuffer();
             i += bufferParameters.channelCount()) {
         pState->accumulator += downsample;

src/effects/builtin/echoeffect.cpp

@@ -189,7 +189,7 @@ void EchoEffect::processChannel(const ChannelHandle& handle, EchoGroupState* pGr
                                         bufferParameters.framesPerBuffer());
 
     //TODO: rewrite to remove assumption of stereo buffer
-    for (unsigned int i = 0;
+    for (SINT i = 0;
             i < bufferParameters.samplesPerBuffer();
             i += bufferParameters.channelCount()) {
         CSAMPLE_GAIN send_ramped = send.getNext();

src/effects/builtin/flangereffect.cpp

@@ -195,10 +195,9 @@ void FlangerEffect::processChannel(const ChannelHandle& handle,
     CSAMPLE* delayLeft = pState->delayLeft;
     CSAMPLE* delayRight = pState->delayRight;
 
-   for (unsigned int i = 0;
-          i < bufferParameters.samplesPerBuffer();
-          i += bufferParameters.channelCount()) {
-
+    for (SINT i = 0;
+            i < bufferParameters.samplesPerBuffer();
+            i += bufferParameters.channelCount()) {
         CSAMPLE_GAIN mix_ramped = mixRamped.getNext();
         CSAMPLE_GAIN regen_ramped = regenRamped.getNext();
         double width_ramped = widthRamped.getNext();

src/effects/builtin/graphiceqeffect.h

@@ -54,7 +54,7 @@ class GraphicEQEffect : public EffectProcessorImpl<GraphicEQEffectGroupState> {
     EngineEffectParameter* m_pPotLow;
     QList<EngineEffectParameter*> m_pPotMid;
     EngineEffectParameter* m_pPotHigh;
-    unsigned int m_oldSampleRate;
+    mixxx::audio::SampleRate m_oldSampleRate;
 
     DISALLOW_COPY_AND_ASSIGN(GraphicEQEffect);
 };

src/effects/builtin/linkwitzriley8eqeffect.h

@@ -34,7 +34,7 @@ class LinkwitzRiley8EQEffectGroupState : public EffectState {
     CSAMPLE* m_pMidBuf;
     CSAMPLE* m_pHighBuf;
 
-    unsigned int m_oldSampleRate;
+    mixxx::audio::SampleRate m_oldSampleRate;
     int m_loFreq;
     int m_hiFreq;
 };

src/effects/builtin/loudnesscontoureffect.h

@@ -28,7 +28,7 @@ class LoudnessContourEffectGroupState final : public EffectState {
     CSAMPLE_GAIN m_oldGain;
     double m_oldFilterGainDb;
     bool m_oldUseGain;
-    unsigned int m_oldSampleRate;
+    mixxx::audio::SampleRate m_oldSampleRate;
 };
 
 class LoudnessContourEffect

src/effects/builtin/lvmixeqbase.h

@@ -253,7 +253,7 @@ class LVMixEQEffectGroupState : public EffectState {
     int m_rampHoldOff;
     int m_groupDelay;
 
-    unsigned int m_oldSampleRate;
+    mixxx::audio::SampleRate m_oldSampleRate;
     double m_loFreq;
     double m_hiFreq;
 

src/effects/builtin/metronomeclick.h

@@ -5,7 +5,7 @@
 // This is a new recording from a real metronome
 // it was converted from *.wav to plain text using Audacity
 
-const unsigned int kClickSize44100 = 1024;
+const SINT kClickSize44100 = 1024;
 const CSAMPLE kClick44100[kClickSize44100] = {
         0.03459f,
         0.09436f,

src/effects/builtin/metronomeeffect.cpp

@@ -77,7 +77,7 @@ void MetronomeEffect::processChannel(
         return;
     }
 
-    unsigned int clickSize = kClickSize44100;
+    SINT clickSize = kClickSize44100;
     const CSAMPLE* click = kClick44100;
     if (bufferParameters.sampleRate() >= 96000) {
         clickSize = kClickSize96000;
@@ -87,12 +87,12 @@ void MetronomeEffect::processChannel(
         click = kClick48000;
     }
 
-    unsigned int maxFrames;
+    SINT maxFrames;
     if (m_pSyncParameter->toBool() && groupFeatures.has_beat_length_sec) {
         maxFrames = static_cast<decltype(maxFrames)>(
                 bufferParameters.sampleRate() * groupFeatures.beat_length_sec);
         if (groupFeatures.has_beat_fraction) {
-            const auto currentFrame = static_cast<unsigned int>(
+            const auto currentFrame = static_cast<decltype(maxFrames)>(
                     maxFrames * groupFeatures.beat_fraction);
             if (maxFrames > clickSize &&
                     currentFrame > clickSize &&
@@ -111,9 +111,9 @@ void MetronomeEffect::processChannel(
 
     if (gs->m_framesSinceClickStart < clickSize) {
         // still in click region, write remaining click frames.
-        const unsigned int copyFrames =
-                math_min(static_cast<unsigned int>(bufferParameters.framesPerBuffer()),
-                         clickSize - gs->m_framesSinceClickStart);
+        const SINT copyFrames =
+                math_min(static_cast<SINT>(bufferParameters.framesPerBuffer()),
+                        clickSize - gs->m_framesSinceClickStart);
         SampleUtil::addMonoToStereo(pOutput, &click[gs->m_framesSinceClickStart],
                 copyFrames);
     }

src/effects/builtin/metronomeeffect.h

@@ -22,7 +22,7 @@ class MetronomeGroupState final : public EffectState {
     ~MetronomeGroupState() {
     }
 
-    unsigned int m_framesSinceClickStart;
+    SINT m_framesSinceClickStart;
 };
 
 class MetronomeEffect : public EffectProcessorImpl<MetronomeGroupState> {

src/effects/builtin/parametriceqeffect.h

@@ -61,8 +61,7 @@ class ParametricEQEffect : public EffectProcessorImpl<ParametricEQEffectGroupSta
     QList<EngineEffectParameter*> m_pPotQ;
     QList<EngineEffectParameter*> m_pPotCenter;
 
-
-    unsigned int m_oldSampleRate;
+    mixxx::audio::SampleRate m_oldSampleRate;
 
     DISALLOW_COPY_AND_ASSIGN(ParametricEQEffect);
 };

src/effects/builtin/phasereffect.cpp

@@ -195,7 +195,7 @@ void PhaserEffect::processChannel(const ChannelHandle& handle,
     const auto stereoCheck = static_cast<int>(m_pStereoParameter->value());
     int counter = 0;
 
-    for (unsigned int i = 0;
+    for (SINT i = 0;
             i < bufferParameters.samplesPerBuffer();
             i += bufferParameters.channelCount()) {
         left = pInput[i] + tanh(left * feedback);

src/effects/builtin/threebandbiquadeqeffect.h

@@ -39,7 +39,7 @@ class ThreeBandBiquadEQEffectGroupState final : public EffectState {
     double m_loFreqCorner;
     double m_highFreqCorner;
 
-    unsigned int m_oldSampleRate;
+    mixxx::audio::SampleRate m_oldSampleRate;
 };
 
 class ThreeBandBiquadEQEffect : public EffectProcessorImpl<ThreeBandBiquadEQEffectGroupState> {

src/effects/builtin/tremoloeffect.cpp

@@ -195,7 +195,7 @@ void TremoloEffect::processChannel(const ChannelHandle& handle,
             m_pPhaseParameter->value() * framePerPeriod);
     currentFrame = currentFrame % framePerPeriod;
 
-    for (unsigned int i = 0;
+    for (SINT i = 0;
             i < bufferParameters.samplesPerBuffer();
             i += bufferParameters.channelCount()) {
         unsigned int positionFrame = (currentFrame - phaseOffsetFrame);

src/sources/soundsourcem4a.cpp

@@ -430,12 +430,12 @@ bool SoundSourceM4A::replaceDecoder(
             return false;
         }
     } else {
-        if (m_pFaad->Init2(
+        if (static_cast<signed char>(m_pFaad->Init2(
                     hNewDecoder,
                     m_pMP4ESConfigBuffer,
                     m_sizeofMP4ESConfigBuffer,
                     &sampleRate,
-                    &channelCount) < 0) {
+                    &channelCount)) < 0) {
             free(m_pMP4ESConfigBuffer);
             m_pMP4ESConfigBuffer = nullptr;
             kLogger.warning() << "Failed to initialize the AAC decoder from "