BeatGrid: Fix wrong multiplication with kFrameSize

The beatgrid now uses frames, so this multiplication results in a beatgrid of half the intended BPM. This was an oversight from mixxxdj#4049.
Holzhaus · Jul 20, 2021 · 0cdf85c · 0cdf85c
1 parent 80e9fa8
commit 0cdf85c
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/src/track/beatgrid.cpp b/src/track/beatgrid.cpp
@@ -14,7 +14,6 @@ struct BeatGridData {
     double firstBeat;
 };
 
-constexpr int kFrameSize = 2;
 constexpr double kBpmScaleRounding = 0.001;
 
 } // namespace
@@ -349,8 +348,8 @@ BeatsPointer BeatGrid::scale(BpmScale scale) const {
 
     bpm = BeatUtils::roundBpmWithinRange(bpm - kBpmScaleRounding, bpm, bpm + kBpmScaleRounding);
     grid.mutable_bpm()->set_bpm(bpm.value());
-    double beatLength = (60.0 * m_sampleRate / bpm.value()) * kFrameSize;
-    return BeatsPointer(new BeatGrid(*this, grid, beatLength));
+    const mixxx::audio::FrameDiff_t beatLengthFrames = (60.0 * m_sampleRate / bpm.value());
+    return BeatsPointer(new BeatGrid(*this, grid, beatLengthFrames));
 }
 
 BeatsPointer BeatGrid::setBpm(mixxx::Bpm bpm) {
@@ -359,8 +358,8 @@ BeatsPointer BeatGrid::setBpm(mixxx::Bpm bpm) {
     }
     mixxx::track::io::BeatGrid grid = m_grid;
     grid.mutable_bpm()->set_bpm(bpm.value());
-    double beatLength = (60.0 * m_sampleRate / bpm.value()) * kFrameSize;
-    return BeatsPointer(new BeatGrid(*this, grid, beatLength));
+    const mixxx::audio::FrameDiff_t beatLengthFrames = (60.0 * m_sampleRate / bpm.value());
+    return BeatsPointer(new BeatGrid(*this, grid, beatLengthFrames));
 }
 
 } // namespace mixxx