diff options
author | Uwe Klotz <uklotz@mixxx.org> | 2020-05-22 19:54:37 +0200 |
---|---|---|
committer | Uwe Klotz <uklotz@mixxx.org> | 2020-06-05 13:25:18 +0200 |
commit | add4b1731eff61e0a4662f25e9469e02999dd8af (patch) | |
tree | 2d95c1677c190869736c855ce5c0d2dde0eaf9fd /src/track | |
parent | 20f21438db93994ce4682caad4456075aab96425 (diff) |
Add coverart_digest column and new cover image hashing
Diffstat (limited to 'src/track')
-rw-r--r-- | src/track/track.cpp | 15 | ||||
-rw-r--r-- | src/track/track.h | 4 |
2 files changed, 6 insertions, 13 deletions
diff --git a/src/track/track.cpp b/src/track/track.cpp index d05cfb1bf9..506359209b 100644 --- a/src/track/track.cpp +++ b/src/track/track.cpp @@ -1157,15 +1157,15 @@ void Track::setCoverInfo(const CoverInfoRelative& coverInfo) { } } -bool Track::refreshCoverImageHash( +bool Track::refreshCoverImageDigest( const QImage& loadedImage) { QMutexLocker lock(&m_qMutex); auto coverInfo = CoverInfo( m_record.getCoverInfo(), m_fileInfo.location()); - if (!coverInfo.refreshImageHash( - loadedImage, - m_pSecurityToken)) { + if (!coverInfo.refreshImageDigest( + loadedImage, + m_pSecurityToken)) { return false; } if (!compareAndSet( @@ -1174,7 +1174,7 @@ bool Track::refreshCoverImageHash( return false; } kLogger.info() - << "Refreshed cover image hash" + << "Refreshed cover image digest" << m_fileInfo.location(); markDirtyAndUnlock(&lock); emit coverArtUpdated(); @@ -1191,11 +1191,6 @@ CoverInfo Track::getCoverInfoWithLocation() const { return CoverInfo(m_record.getCoverInfo(), m_fileInfo.location()); } -quint16 Track::getCoverHash() const { - QMutexLocker lock(&m_qMutex); - return m_record.getCoverInfo().hash; -} - ExportTrackMetadataResult Track::exportMetadata( mixxx::MetadataSourcePointer pMetadataSource) { VERIFY_OR_DEBUG_ASSERT(pMetadataSource) { diff --git a/src/track/track.h b/src/track/track.h index 8d4f8e33a5..97d2b95066 100644 --- a/src/track/track.h +++ b/src/track/track.h @@ -310,11 +310,9 @@ class Track : public QObject { // If the corresponding image has already been loaded it // could be provided as a parameter to avoid reloading // if actually needed. - bool refreshCoverImageHash( + bool refreshCoverImageDigest( const QImage& loadedImage = QImage()); - quint16 getCoverHash() const; - // Set/get track metadata and cover art (optional) all at once. void importMetadata( mixxx::TrackMetadata importedMetadata, |