diff options
| author | Daniel Schürmann <daschuer@mixxx.org> | 2020-10-07 22:43:39 +0200 |
|---|---|---|
| committer | Daniel Schürmann <daschuer@mixxx.org> | 2020-10-07 22:43:39 +0200 |
| commit | a050e64ad417f2909443f314accaa2a94d89ec0c (patch) | |
| tree | 1f2d5b4824f1ab3e31bd2b1d302e21917abf516d /src/engine | |
| parent | 2c666a5b1b2a8694c1d83ec9e2e6d1381a1c370e (diff) | |
| parent | 7ad9de30558cbad2968a9199274e07380f90b861 (diff) | |
Merge remote-tracking branch 'upstream/2.2' into 2.3
Diffstat (limited to 'src/engine')
| -rw-r--r-- | src/engine/controls/loopingcontrol.cpp | 2 | ||||
| -rw-r--r-- | src/engine/controls/vinylcontrolcontrol.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/engine/controls/loopingcontrol.cpp b/src/engine/controls/loopingcontrol.cpp index 64b86e711b..a10b538528 100644 --- a/src/engine/controls/loopingcontrol.cpp +++ b/src/engine/controls/loopingcontrol.cpp @@ -617,7 +617,7 @@ void LoopingControl::setLoopOutToCurrentPosition() { mixxx::BeatsPointer pBeats = m_pBeats; LoopSamples loopSamples = m_loopSamples.getValue(); double quantizedBeat = -1; - int pos = m_currentSample.getValue(); + double pos = m_currentSample.getValue(); if (m_pQuantizeEnabled->toBool() && pBeats) { if (m_bAdjustingLoopOut) { double closestBeat = m_pClosestBeat->get(); diff --git a/src/engine/controls/vinylcontrolcontrol.cpp b/src/engine/controls/vinylcontrolcontrol.cpp index 5de2b30563..3ff663622d 100644 --- a/src/engine/controls/vinylcontrolcontrol.cpp +++ b/src/engine/controls/vinylcontrolcontrol.cpp @@ -117,7 +117,7 @@ void VinylControlControl::slotControlVinylSeek(double fractionalPos) { } double shortest_distance = 0; - int nearest_playpos = -1; + double nearest_playpos = -1; const QList<CuePointer> cuePoints(pTrack->getCuePoints()); QListIterator<CuePointer> it(cuePoints); @@ -127,7 +127,7 @@ void VinylControlControl::slotControlVinylSeek(double fractionalPos) { continue; } - int cue_position = pCue->getPosition(); + double cue_position = pCue->getPosition(); // pick cues closest to new_playpos if ((nearest_playpos == -1) || (fabs(new_playpos - cue_position) < shortest_distance)) { |