From add4b1731eff61e0a4662f25e9469e02999dd8af Mon Sep 17 00:00:00 2001
From: Uwe Klotz <uklotz@mixxx.org>
Date: Fri, 22 May 2020 19:54:37 +0200
Subject: Add coverart_digest column and new cover image hashing

---
 src/track/track.cpp | 15 +++++----------
 src/track/track.h   |  4 +---
 2 files changed, 6 insertions(+), 13 deletions(-)

(limited to 'src/track')

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,
-- 
cgit v1.2.3