MP1-1961: Embedded Cover Art can now also displayed using Database Views

MediaPortal · Nov 6, 2014 · 155735e · 155735e
1 parent c5134ab
commit 155735e
Showing 1 changed file with 15 additions and 3 deletions.
diff --git a/mediaportal/WindowPlugins/GUIMusic/GUIMusicGenres.cs b/mediaportal/WindowPlugins/GUIMusic/GUIMusicGenres.cs
@@ -516,8 +516,9 @@ protected override void OnRetrieveCoverArt(GUIListItem item)
         }
         // Add Code here if users want to add pics showing "A", "B" and "C" ;)
       }
-      else
-      {
+      else
+      {
+        MusicTag tag;
         switch (filter.Where)
         {
           case "genre":
@@ -547,6 +548,17 @@ protected override void OnRetrieveCoverArt(GUIListItem item)
 
           case "track":
           {
+            // If we want to get the Cover from embedded cover arts, we need to re-read the Tag from the file, 
+            // since the database query didn't return a cover
+            if (_useEmbeddedCover)
+            {
+              tag = item.MusicTag as MusicTag;
+              if (tag != null && tag.CoverArtImageBytes == null)
+              {
+                item.MusicTag = TagReader.TagReader.ReadTag(item.Path);
+              }
+            }
+
             base.OnRetrieveCoverArt(item);
             break;
           }
@@ -555,7 +567,7 @@ protected override void OnRetrieveCoverArt(GUIListItem item)
           case "album":
 
             bool thumbFound = false;
-            MusicTag tag = item.MusicTag as MusicTag;
+            tag = item.MusicTag as MusicTag;
             strThumb = Util.Utils.GetAlbumThumbName(tag.Artist, tag.Album);
             if (Util.Utils.FileExistsInCache(strThumb))
             {