diff options
author | Daniel Schürmann <daschuer@mixxx.org> | 2014-12-29 12:33:42 +0100 |
---|---|---|
committer | Daniel Schürmann <daschuer@mixxx.org> | 2014-12-29 12:33:42 +0100 |
commit | 0ff0688549ab3817c04d60c2e8f6738bc1c9460c (patch) | |
tree | 20189e5bcd7fb2e2f5ee98e26d157cbe60b1c47c /src/engine/keycontrol.cpp | |
parent | e8e93433f55828f2b085ac505ef867d1717bdb39 (diff) |
fixed lost SpeedSliderPitchRatio from last commit
Diffstat (limited to 'src/engine/keycontrol.cpp')
-rw-r--r-- | src/engine/keycontrol.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/engine/keycontrol.cpp b/src/engine/keycontrol.cpp index ff82a0fc1e..a2b71e378a 100644 --- a/src/engine/keycontrol.cpp +++ b/src/engine/keycontrol.cpp @@ -289,14 +289,18 @@ void KeyControl::slotPitchChanged(double pitch) { // pitchRateInfo.pitchTweakRatio << // pitchRateInfo.tempoRatio; + double speedSliderPitchRatio = pitchRateInfo.pitchRatio / pitchRateInfo.pitchTweakRatio; + double pitchRatio = KeyUtils::octaveChangeToPowerOf2(pitch / 12); if (m_iPitchAndKeylockMode == kOffsetScaleLockOriginalKey) { // Pitch slider presents only the offset, calc absolute pitch - double speedSliderPitchRatio = pitchRateInfo.pitchRatio / pitchRateInfo.pitchTweakRatio; pitchRatio *= speedSliderPitchRatio; } pitchRateInfo.pitchRatio = pitchRatio; + // speedSliderPitchRatio must be unchanged + pitchRateInfo.pitchTweakRatio = pitchRateInfo.pitchRatio / speedSliderPitchRatio; + m_pitchRateInfo.setValue(pitchRateInfo); double dFileKey = m_pFileKey->get(); |