Use the Service Util funciton to fill artwork.

Simplifies code, no functional change.
MythTV · Nov 27, 2011 · cc1314d · cc1314d
1 parent 1c77c9d
commit cc1314d
Showing 1 changed file with 4 additions and 34 deletions.
diff --git a/mythtv/programs/mythbackend/services/content.cpp b/mythtv/programs/mythbackend/services/content.cpp
@@ -33,6 +33,7 @@
 #include "previewgenerator.h"
 #include "backendutil.h"
 #include "httprequest.h"
+#include "serviceUtil.h"
 #include "util.h"
 #include "mythdownloadmanager.h"
 #include "metadataimagehelper.h"
@@ -269,42 +270,11 @@ DTC::ArtworkInfoList* Content::GetRecordingArtworkList( int              nChanId
 DTC::ArtworkInfoList* Content::GetProgramArtworkList( const QString &sInetref,
                                                       int            nSeason  )
 {
-    ArtworkMap map = GetArtwork(sInetref, nSeason);
+    DTC::ArtworkInfoList *pArtwork = new DTC::ArtworkInfoList();
 
-    DTC::ArtworkInfoList *pInfos = new DTC::ArtworkInfoList();
+    FillArtworkInfoList (pArtwork, sInetref, nSeason);
 
-    for (ArtworkMap::const_iterator i = map.begin();
-         i != map.end(); ++i)
-    {
-        DTC::ArtworkInfo *pArtInfo = pInfos->AddNewArtworkInfo();
-        pArtInfo->setFileName(i.value().url);
-        switch (i.key())
-        {
-            case kArtworkFanart:
-                pArtInfo->setStorageGroup("Fanart");
-                pArtInfo->setType("fanart");
-                pArtInfo->setURL(QString("/Content/GetImageFile?StorageGroup=%1"
-                              "&FileName=%2").arg("Fanart")
-                              .arg(QUrl(i.value().url).path()));
-                break;
-            case kArtworkBanner:
-                pArtInfo->setStorageGroup("Banners");
-                pArtInfo->setType("banner");
-                pArtInfo->setURL(QString("/Content/GetImageFile?StorageGroup=%1"
-                              "&FileName=%2").arg("Fanart")
-                              .arg(QUrl(i.value().url).path()));
-                break;
-            case kArtworkCoverart:
-            default:
-                pArtInfo->setStorageGroup("Coverart");
-                pArtInfo->setType("coverart");
-                pArtInfo->setURL(QString("/Content/GetImageFile?StorageGroup=%1"
-                              "&FileName=%2").arg("Fanart")
-                              .arg(QUrl(i.value().url).path()));
-                break;
-        }
-    }
-    return pInfos;
+    return pArtwork;
 }
 /////////////////////////////////////////////////////////////////////////////
 //