Manual inline requestUncachedCoverPrivate()

mixxxdj · Nov 12, 2023 · 2f956ee · 2f956ee
1 parent c8f308d
commit 2f956ee
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 14 deletions.
diff --git a/src/library/coverartcache.cpp b/src/library/coverartcache.cpp
@@ -107,18 +107,17 @@ QPixmap CoverArtCache::getCachedCover(
 }
 
 // static
-void CoverArtCache::requestUncachedCoverPrivate(
+void CoverArtCache::requestUncachedCover(
         const QObject* pRequester,
-        const TrackPointer& pTrack,
         const CoverInfo& coverInfo,
         int desiredWidth) {
     CoverArtCache* pCache = CoverArtCache::instance();
     VERIFY_OR_DEBUG_ASSERT(pCache) {
-        return;
+      return;
     }
     pCache->tryLoadCover(
             pRequester,
-            pTrack,
+            TrackPointer(),
             coverInfo,
             desiredWidth);
 }
@@ -131,7 +130,12 @@ void CoverArtCache::requestUncachedCover(
     VERIFY_OR_DEBUG_ASSERT(pTrack) {
         return;
     }
-    requestUncachedCoverPrivate(
+
+    CoverArtCache* pCache = CoverArtCache::instance();
+    VERIFY_OR_DEBUG_ASSERT(pCache) {
+        return;
+    }
+    pCache->tryLoadCover(
             pRequester,
             pTrack,
             pTrack->getCoverInfoWithLocation(),

diff --git a/src/library/coverartcache.h b/src/library/coverartcache.h
@@ -30,9 +30,7 @@ class CoverArtCache : public QObject, public Singleton<CoverArtCache> {
     static void requestUncachedCover(
             const QObject* pRequester,
             const CoverInfo& coverInfo,
-            int desiredWidth) {
-        requestUncachedCoverPrivate(pRequester, TrackPointer(), coverInfo, desiredWidth);
-    }
+            int desiredWidth);
 
     static void requestUncachedCover(
             const QObject* pRequester,
@@ -87,12 +85,6 @@ class CoverArtCache : public QObject, public Singleton<CoverArtCache> {
             const CoverInfo& coverInfo,
             int desiredWidth = 0); // <= 0: original size
 
-    static void requestUncachedCoverPrivate(
-            const QObject* pRequester,
-            const TrackPointer& /*optional*/ pTrack,
-            const CoverInfo& coverInfo,
-            int desiredWidth);
-
     void tryLoadCover(
             const QObject* pRequester,
             const TrackPointer& pTrack,