Ticket #3493: coverart.final.diff

libs/libmythtv/osd.cpp

@@ -1720 +1720 @@
                 cs->Load(" ", wmult, hmult, 30, 30);
         }
 
+        OSDTypeImage *cs1 = (OSDTypeImage *)container->GetType("coverart");
+        if (cs1)
+        {
+            if ((infoMap.contains("coverartpath")) && (infoMap["coverartpath"] != ""))
+                cs1->Load(infoMap["coverartpath"], wmult, hmult, 30, 30);
+        }
+
         m_setsvisible = true;
         changed = true;
     }
@@ -1743 +1750 @@
                 cs->Load(" ", wmult, hmult, 30, 30);
         }
 
+        OSDTypeImage *cs1 = (OSDTypeImage *)container->GetType("coverart");
+        if (cs1)
+        {
+            if ((infoMap.contains("coverartpath")) && (infoMap["coverartpath"] != ""))
+                cs1->Load(infoMap["coverartpath"], wmult, hmult, 30, 30);
+        }
+
         container->DisplayFor(length * 1000000);
         m_setsvisible = true;
         changed = true;

libs/libmyth/programinfo.cpp

@@ -722 +722 @@
     progMap["channel"] = ChannelText(channelFormat);
     progMap["longchannel"] = ChannelText(longChannelFormat);
     progMap["iconpath"] = "";
+    progMap["coverartpath"] = "";
 
+    if (isVideo) 
+    { 
+
+        if (pathname.startsWith("dvd:")) 
+        { 
+            progMap["coverartpath"] = "";
+        } 
+        else 
+        { 
+            QFileInfo fi(pathname); 
+            QString fn = fi.fileName(); 
+            fn.prepend("%"); 
+
+            MSqlQuery query(MSqlQuery::InitCon());
+            query.prepare("SELECT coverfile FROM videometadata WHERE filename LIKE :FILENAME ;"); 
+            query.bindValue(":FILENAME", fn); 
+
+            if (query.exec() && query.next()) 
+                progMap["coverartpath"] = query.value(0).toString(); 
+        } 
+    } 
+
     QString tmpSize;
 
     tmpSize.sprintf("%0.2f ", filesize / 1024.0 / 1024.0 / 1024.0);