diff options
author | Daniel Schürmann <daschuer@mixxx.org> | 2021-03-11 10:24:40 +0100 |
---|---|---|
committer | Daniel Schürmann <daschuer@mixxx.org> | 2021-03-11 14:18:45 +0100 |
commit | 4f473a8c2a163d4e00b0bc9db5843fe468df6ded (patch) | |
tree | 3cb7f4d3941c606cfd30f49de510380e2b78cdb7 /src/library | |
parent | 8869f2ae8379b8a08f79baed9550f1c32748519e (diff) |
Add wapper trySetAndLockBeats() to stream line the track API
Diffstat (limited to 'src/library')
-rw-r--r-- | src/library/dao/trackdao.cpp | 8 | ||||
-rw-r--r-- | src/library/dlgtrackinfo.cpp | 2 | ||||
-rw-r--r-- | src/library/rekordbox/rekordboxfeature.cpp | 2 |
3 files changed, 8 insertions, 4 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; } 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) { |