Merge branch 'master' into NewSoundSourceAPI

1 files changed, 8 insertions, 5 deletions

diff --git a/src/vinylcontrol/vinylcontrolxwax.cpp b/src/vinylcontrol/vinylcontrolxwax.cpp
index 0a736c483e..6f3d9634cf 100644
--- a/src/vinylcontrol/vinylcontrolxwax.cpp
+++ b/src/vinylcontrol/vinylcontrolxwax.cpp
@@ -603,7 +603,12 @@ void VinylControlXwax::analyzeSamples(CSAMPLE* pSamples, size_t nFrames) {
                 // For extremely small changes, converge very slowly.
                 m_dDisplayPitch += pitch_difference * .01;
             }
-            m_pRateSlider->slotSet(rateDir->get() * (m_dDisplayPitch - 1.0) / rateRange->get());
+            // Don't show extremely high or low speeds in the UI.
+            if (m_dDisplayPitch < 1.9 && m_dDisplayPitch > 0.2) {
+                m_pRateSlider->set(rateDir->get() * (m_dDisplayPitch - 1.0) / rateRange->get());
+            } else {
+                m_pRateSlider->set(0.0);
+            }
             m_dUiUpdateTime = filePosition;
         }
 
@@ -742,14 +747,12 @@ double VinylControlXwax::checkSteadyPitch(double pitch, double time) {
     if (m_bWasReversed) {
         return 0;
     }
-    if (m_pSteadyGross->check(pitch, time,
-                              static_cast<bool>(loopEnabled->get())) < 0.5) {
+    if (m_pSteadyGross->check(pitch, time) < 0.5) {
         scratching->slotSet(1.0);
     } else {
         scratching->slotSet(0.0);
     }
-    return m_pSteadySubtle->check(pitch, time,
-                                  static_cast<bool>(loopEnabled->get()));
+    return m_pSteadySubtle->check(pitch, time);
 }
 
 //Synchronize Mixxx's position to the position of the timecoded vinyl.