From 4f473a8c2a163d4e00b0bc9db5843fe468df6ded Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Thu, 11 Mar 2021 10:24:40 +0100
Subject: Add wapper trySetAndLockBeats() to stream line the track API

---
 src/library/dao/trackdao.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'src/library/dao')

diff --git a/src/library/dao/trackdao.cpp b/src/library/dao/trackdao.cpp
index 681e1a4a03..0528825a1e 100644
--- a/src/library/dao/trackdao.cpp
+++ b/src/library/dao/trackdao.cpp
@@ -1090,11 +1090,15 @@ bool setTrackBeats(const QSqlRecord& record, const int column,
     const mixxx::BeatsPointer pBeats = BeatFactory::loadBeatsFromByteArray(
             pTrack->getSampleRate(), beatsVersion, beatsSubVersion, beatsBlob);
     if (pBeats) {
-        pTrack->trySetBeats(pBeats, bpmLocked);
+        if (bpmLocked) {
+            pTrack->trySetAndLockBeats(pBeats);
+        } else {
+            pTrack->trySetBeats(pBeats);
+        }
     } else {
         // Load a temorary beat grid without offset that will be replaced by the analyzer.
         const auto pBeats = BeatFactory::makeBeatGrid(pTrack->getSampleRate(), bpm, 0.0);
-        pTrack->trySetBeats(pBeats, false);
+        pTrack->trySetBeats(pBeats);
     }
     return false;
 }
-- 
cgit v1.2.3