diff options
| author | Uwe Klotz <uklotz@mixxx.org> | 2020-11-20 14:06:36 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-20 14:06:36 +0100 |
| commit | 8c4309712ca16a6a104ba404cb81b28da9fe30f8 (patch) | |
| tree | 35ae17d372cb77c25ecdf49acd7c3cd6bd246cc9 /src/track/track.cpp | |
| parent | 01a7129c6bae939a85f570de5ff9af2cec6fd2b0 (diff) | |
| parent | f99d07b0a96cdbcf8c309fc0d7dc13dd2fc0b197 (diff) | |
Merge branch '2.3' into clazy-returning-void-expression
Diffstat (limited to 'src/track/track.cpp')
| -rw-r--r-- | src/track/track.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/track/track.cpp b/src/track/track.cpp index 24cd01303a..237a88e9a6 100644 --- a/src/track/track.cpp +++ b/src/track/track.cpp @@ -140,7 +140,7 @@ void Track::relocate( void Track::importMetadata( mixxx::TrackMetadata importedMetadata, - QDateTime metadataSynchronized) { + const QDateTime& metadataSynchronized) { // Safe some values that are needed after move assignment and unlocking(see below) const auto newBpm = importedMetadata.getTrackInfo().getBpm(); const auto newKey = importedMetadata.getTrackInfo().getKey(); @@ -853,7 +853,7 @@ CuePointer Track::findCueByType(mixxx::CueType type) const { return CuePointer(); } -CuePointer Track::findCueById(int id) const { +CuePointer Track::findCueById(DbId id) const { QMutexLocker lock(&m_qMutex); for (const CuePointer& pCue : m_cuePoints) { if (pCue->getId() == id) { |