Ticket #1139: icons.diff

myththemes/MythCenter/ui.xml

@@ -1565 +1565 @@
         <filename>type/processing.png</filename>
         <position>160,195</position>
       </image>
+      <image name="stereo" draworder="6">
+        <filename>type/stereo.png</filename>
+        <position>195,195</position>
+      </image>
+      <image name="cc" draworder="6">
+        <filename>type/cc.png</filename>
+        <position>230,195</position>
+      </image>
+      <image name="hdtv" draworder="6">
+        <filename>type/hd.png</filename>
+        <position>275,195</position>
+      </image>
 
     </container>
 

mythtv/libs/libmythtv/programinfo.h

@@ -273 +273 @@
     
     QString year;
     float stars;
+    bool stereo;
+    bool cc;
+    bool hd;
 
     QDate originalAirDate;
     QDateTime lastmodified;

mythtv/libs/libmythtv/programinfo.cpp

@@ -74 +74 @@
     chanOutputFilters = "";
     year = "";
     stars = 0;
+    stereo = 0;
+    cc = 0;
+    hd = 0;
     availableStatus = asAvailable;    
 
     pathname = "";
@@ -216 +219 @@
 
     originalAirDate = other.originalAirDate;
     stars = other.stars;
+    stereo = other.stereo;
+    cc = other.cc;
+    hd = other.hd;
     year = QDeepCopy<QString>(other.year);
     ignoreBookmark = other.ignoreBookmark; 
    
@@ -301 +307 @@
     STR_TO_LIST(programid)
     DATETIME_TO_LIST(lastmodified)
     FLOAT_TO_LIST(stars)
+    INT_TO_LIST(stereo)
+    INT_TO_LIST(cc)
+    INT_TO_LIST(hd)
     DATETIME_TO_LIST(QDateTime(originalAirDate))
     INT_TO_LIST(hasAirDate)     
     STR_TO_LIST((playgroup != "") ? playgroup : "Default")
@@ -399 +408 @@
     STR_FROM_LIST(programid)
     DATETIME_FROM_LIST(lastmodified)
     FLOAT_FROM_LIST(stars)
+    INT_FROM_LIST(stereo)
+    INT_FROM_LIST(cc)
+    INT_FROM_LIST(hd)
     DATE_FROM_LIST(originalAirDate);
     INT_FROM_LIST(hasAirDate);
     STR_FROM_LIST(playgroup)
@@ -596 +608 @@
     }
     else
         progMap["stars"] = "";
+
+    progMap["stereo"] = stereo;
+    progMap["cc"] = cc;
+    progMap["hdtv"] = hd;
         
     if (hasAirDate)
     {
@@ -699 +715 @@
     p->programid          = "";
     p->year               = "";
     p->stars              = 0.0f;
+    p->stereo             = 0;
+    p->cc                 = 0;
+    p->hd                 = 0;
 
     if (!genUnknown)
         return p;
@@ -3964 +3983 @@
         "    program.airdate, program.stars, program.originalairdate, "
         "    program.category_type, oldrecstatus.recordid, "
         "    oldrecstatus.rectype, oldrecstatus.recstatus, "
-        "    oldrecstatus.findid "
+        "    oldrecstatus.findid, program.stereo, program.hdtv, "
+        "    program.closecaptioned "
         "FROM program "
         "LEFT JOIN channel ON program.chanid = channel.chanid "
         "LEFT JOIN oldrecorded AS oldrecstatus ON "
@@ -4035 +4055 @@
         p->rectype = RecordingType(query.value(20).toInt());
         p->recstatus = RecStatusType(query.value(21).toInt());
         p->findid = query.value(22).toInt();
+        p->stereo = query.value(23).toInt();
+        p->cc = query.value(25).toInt();
+        p->hd = query.value(24).toInt();
 
         ProgramInfo *s;
         for (s = schedList.first(); s; s = schedList.next())
@@ -4052 +4075 @@
                 p->dupin = s->dupin;
                 p->dupmethod = s->dupmethod;
                 p->findid = s->findid;
+                p->stereo = s->stereo;
+                p->cc = s->cc;
+                p->hd = s->hd;
             }
         }
 

mythtv/programs/mythfrontend/playbackbox.cpp

@@ -741 +741 @@
                 itype->hide();
         }
 
+        itype = (UIImageType *)container->GetType("stereo");
+        if (itype)
+        {
+            if (curitem->stereo)
+                itype->show();
+            else
+                itype->hide();
+        }
+
+        itype = (UIImageType *)container->GetType("cc");
+        if (itype)
+        {
+            if (curitem->cc)
+                itype->show();
+            else
+                itype->hide();
+        }
+
+        itype = (UIImageType *)container->GetType("hdtv");
+        if (itype)
+        {
+            if (curitem->hd)
+                itype->show();
+            else
+                itype->hide();
+        }
+
         container->Draw(&tmp, 6, (type == Delete) ? 1 : 0);
     }
 

mythtv/programs/mythbackend/mainserver.cpp

@@ -958 +958 @@
                        "recorded.lastmodified, recorded.findid, "
                        "recorded.originalairdate, recorded.playgroup, "
                        "recorded.basename, recorded.progstart, "
-                       "recorded.progend, recorded.stars "
+                       "recorded.progend, recorded.stars, "
+                       "recordedprogram.stereo, recordedprogram.hdtv, "
+                       "recordedprogram.closecaptioned "
                        "FROM recorded "
                        "LEFT JOIN record ON recorded.recordid = record.recordid "
                        "LEFT JOIN channel ON recorded.chanid = channel.chanid "
+                       "LEFT JOIN recordedprogram ON (recorded.chanid = recordedprogram.chanid "
+                              "AND recorded.starttime = recordedprogram.starttime) "
                        "WHERE (recorded.deletepending = 0 OR "
                               "DATE_ADD(recorded.lastmodified, "
                                        "INTERVAL 5 MINUTE) <= NOW()) "
@@ -1086 +1090 @@
             }
 
             proginfo->stars = query.value(31).toDouble();
+            proginfo->stereo = query.value(32).toInt();
+            proginfo->cc = query.value(34).toInt();
+            proginfo->hd = query.value(33).toInt();
 
             QString lpath = fileprefix + "/" + basename;
             PlaybackSock *slave = NULL;