summaryrefslogtreecommitdiffstats
path: root/src/library/dao
diff options
context:
space:
mode:
authorDaniel Schürmann <daschuer@mixxx.org>2021-03-11 10:24:40 +0100
committerDaniel Schürmann <daschuer@mixxx.org>2021-03-11 14:18:45 +0100
commit4f473a8c2a163d4e00b0bc9db5843fe468df6ded (patch)
tree3cb7f4d3941c606cfd30f49de510380e2b78cdb7 /src/library/dao
parent8869f2ae8379b8a08f79baed9550f1c32748519e (diff)
Add wapper trySetAndLockBeats() to stream line the track API
Diffstat (limited to 'src/library/dao')
-rw-r--r--src/library/dao/trackdao.cpp8
1 files changed, 6 insertions, 2 deletions
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;
}