Ticket #3493: coverart.2.patch

libs/libmythtv/osd.cpp

@@ -1631 +1631 @@
                 cs->LoadImage(" ", wmult, hmult, 30, 30);
         }
 
+        OSDTypeImage *cs1 = (OSDTypeImage *)container->GetType("coverart");
+        if (cs1)
+        {
+            if ((infoMap.contains("coverartpath")) && (infoMap["coverartpath"] != ""))
+                cs1->LoadImage(infoMap["coverartpath"], wmult, hmult, 30, 30);
+        }
+
         m_setsvisible = true;
         changed = true;
     }
@@ -1654 +1661 @@
                 cs->LoadImage(" ", wmult, hmult, 30, 30);
         }
 
+        OSDTypeImage *cs1 = (OSDTypeImage *)container->GetType("coverart");
+        if (cs1)
+        {
+            if ((infoMap.contains("coverartpath")) && (infoMap["coverartpath"] != ""))
+                cs1->LoadImage(infoMap["coverartpath"], wmult, hmult, 30, 30);
+        }
+
         container->DisplayFor(length * 1000000);
         m_setsvisible = true;
         changed = true;
@@ -1703 +1717 @@
         type = (OSDTypeText *)container->GetType("callsign");
         if (type)
             type->SetText(callsign.left(5));
+            
         OSDTypeImage *cs = (OSDTypeImage *)container->GetType("channelicon");
         if (cs)
             cs->LoadImage(iconpath, wmult, hmult, 30, 30);

libs/libmythtv/programinfo.cpp

@@ -449 +449 @@
 
     QString length;
     int hours, minutes, seconds;
+    bool isDVDImage = false;
     
     progMap["title"] = title;
     progMap["subtitle"] = subtitle;
@@ -501 +502 @@
     progMap["channel"] = ChannelText(channelFormat);
     progMap["longchannel"] = ChannelText(longChannelFormat);
     progMap["iconpath"] = "";
+    progMap["coverartpath"] = "";
 
     QString tmpSize;
 
@@ -573 +575 @@
 
     MSqlQuery query(MSqlQuery::InitCon());
 
-    query.prepare("SELECT icon FROM channel WHERE chanid = :CHANID ;");
-    query.bindValue(":CHANID", chanid);
+    if (!isVideo)
+    {
+        query.prepare("SELECT icon FROM channel WHERE chanid = :CHANID ;");
+        query.bindValue(":CHANID", chanid);
         
-    if (query.exec() && query.isActive() && query.size() > 0)
+        if (query.exec() && query.isActive() && query.size() > 0)
         if (query.next())
             progMap["iconpath"] = query.value(0).toString();
+    }
+    else
+    {
+        if (pathname.findRev(".iso", -1, false) == (int)pathname.length() - 4 ||       
+            pathname.findRev(".img", -1, false) == (int)pathname.length() - 4)
+        {
+           isDVDImage = true;
+        }
+
+        if (pathname.startsWith("dvd:") && !isDVDImage)
+        {
+           progMap["coverartpath"] = "";
+        }
+        else
+        {
+           QString fn;
+           
+           if (isDVDImage)
+             fn = pathname.right(pathname.length() - 4);
+           else
+             fn = pathname;
+             
+           query.prepare("SELECT coverfile FROM videometadata WHERE filename = :FILENAME ;");
+           query.bindValue(":FILENAME", fn);
+        
+           if (query.exec() && query.isActive() && query.size() > 0)
+           
+           if (query.next())
+              progMap["coverartpath"] = query.value(0).toString();
+        }
 
+    }
+       
     progMap["RECSTATUS"] = RecStatusText();
 
     if (repeat)