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 ++++++--
 src/library/dlgtrackinfo.cpp               | 2 +-
 src/library/rekordbox/rekordboxfeature.cpp | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

(limited to 'src/library')

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;
 }
diff --git a/src/library/dlgtrackinfo.cpp b/src/library/dlgtrackinfo.cpp
index 2e953e4381..eb77924aaf 100644
--- a/src/library/dlgtrackinfo.cpp
+++ b/src/library/dlgtrackinfo.cpp
@@ -396,7 +396,7 @@ void DlgTrackInfo::saveTrack() {
     m_pLoadedTrack->setTrackNumber(txtTrackNumber->text());
     m_pLoadedTrack->setComment(txtComment->toPlainText());
 
-    m_pLoadedTrack->trySetBeats(m_pBeatsClone, false);
+    m_pLoadedTrack->trySetBeats(m_pBeatsClone);
     reloadTrackBeats(*m_pLoadedTrack);
 
     // If the user is editing the key and hits enter to close DlgTrackInfo, the
diff --git a/src/library/rekordbox/rekordboxfeature.cpp b/src/library/rekordbox/rekordboxfeature.cpp
index 80a52bb99b..f9bd652170 100644
--- a/src/library/rekordbox/rekordboxfeature.cpp
+++ b/src/library/rekordbox/rekordboxfeature.cpp
@@ -870,7 +870,7 @@ void readAnalyze(TrackPointer track,
                     static_cast<SINT>(sampleRate),
                     mixxx::rekordboxconstants::beatsSubversion,
                     beats);
-            track->trySetBeats(pBeats, false);
+            track->trySetBeats(pBeats);
         } break;
         case rekordbox_anlz_t::SECTION_TAGS_CUES: {
             if (ignoreCues) {
-- 
cgit v1.2.3