diff options
author | Owen Williams <owilliams@mixxx.org> | 2015-02-25 10:58:35 -0500 |
---|---|---|
committer | Owen Williams <owilliams@mixxx.org> | 2015-02-25 10:58:35 -0500 |
commit | 0f693744be0e8a21db1a2ba1e12358bf2e922781 (patch) | |
tree | 5a915008838be94612203d3ca4be7b8d2ed03bab /src/vinylcontrol/vinylcontrolxwax.cpp | |
parent | 1c1888e01ecc8896801850fc793b1bdc4693fe1e (diff) |
Don't report non-steady on any resync, not just loops
Don't switch to linear stretching if scratching with rubberband, it works ok
Fixes lp:#1424898
Diffstat (limited to 'src/vinylcontrol/vinylcontrolxwax.cpp')
-rw-r--r-- | src/vinylcontrol/vinylcontrolxwax.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/vinylcontrol/vinylcontrolxwax.cpp b/src/vinylcontrol/vinylcontrolxwax.cpp index 17429b2b4b..d822d7feeb 100644 --- a/src/vinylcontrol/vinylcontrolxwax.cpp +++ b/src/vinylcontrol/vinylcontrolxwax.cpp @@ -604,7 +604,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; } @@ -743,14 +748,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. |