Rearrange code, to clarify that copySamples is allways <= numSamples

AndreiRO · Apr 4, 2015 · f40e5c1 · f40e5c1
1 parent ecd3133
commit f40e5c1
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 20 deletions.
diff --git a/src/effects/native/bessel4lvmixeqeffect.cpp b/src/effects/native/bessel4lvmixeqeffect.cpp
@@ -212,16 +212,11 @@ void Bessel4LVMixEQEffect::processChannel(const ChannelHandle& handle,
                 } 
             }
 
-            if (pState->m_rampHoldOff >= static_cast<int>(numSamples)) {
-                // ramping is done in one of the following calls
-                copySamples = numSamples;
-                rampingSamples = 0;
-            } else {
-                // ramping in this call 
-                copySamples = pState->m_rampHoldOff;
-                rampingSamples = numSamples - pState->m_rampHoldOff; 
-            }
-            pState->m_rampHoldOff -= copySamples; 
+            // ramping is done in one of the following calls if
+            // pState->m_rampHoldOff >= numSamples;
+            copySamples = math_min<int>(pState->m_rampHoldOff, numSamples);
+            pState->m_rampHoldOff -= copySamples;
+            rampingSamples = numSamples - copySamples;
 
             SampleUtil::copy3WithGain(pOutput,
                     pState->m_pLowBuf, pState->old_low,

diff --git a/src/effects/native/bessel8lvmixeqeffect.cpp b/src/effects/native/bessel8lvmixeqeffect.cpp
@@ -212,16 +212,11 @@ void Bessel8LVMixEQEffect::processChannel(const ChannelHandle& handle,
                 } 
             }
 
-            if (pState->m_rampHoldOff >= static_cast<int>(numSamples)) {
-                // ramping is done in one of the following calls
-                copySamples = numSamples;
-                rampingSamples = 0;
-            } else {
-                // ramping in this call 
-                copySamples = pState->m_rampHoldOff;
-                rampingSamples = numSamples - pState->m_rampHoldOff; 
-            }
-            pState->m_rampHoldOff -= copySamples; 
+            // ramping is done in one of the following calls if
+            // pState->m_rampHoldOff >= numSamples;
+            copySamples = math_min<int>(pState->m_rampHoldOff, numSamples);
+            pState->m_rampHoldOff -= copySamples;
+            rampingSamples = numSamples - copySamples;
 
             SampleUtil::copy3WithGain(pOutput,
                     pState->m_pLowBuf, pState->old_low,