Ticket #2124: preservediff.diff

themes/blue/ui.xml

@@ -889 +889 @@
         <position>20,106</position>
       </image>
 
+      <image name="preserved" draworder="6">
+        <filename>type/preserve.png</filename>
+        <position>289,106</position>
+      </image>
+      
+
     </container>
 
     <container name="program_info_del">

libs/libmythtv/programinfo.h

@@ -55 +55 @@
     FL_STEREO         = 0x080,
     FL_CC             = 0x100,
     FL_HDTV           = 0x200,
-    FL_TRANSCODED     = 0x400
+    FL_TRANSCODED     = 0x400,
+    FL_PRESERVED      = 0x800
 };
 
 enum RecStatusType {

libs/libmythtv/programinfo.cpp

@@ -3508 +3508 @@
     MSqlQuery query(MSqlQuery::InitCon());
 
     query.prepare("SELECT commflagged, cutlist, autoexpire, "
-                  "editing, bookmark, stereo, closecaptioned, hdtv "
+                  "editing, bookmark, stereo, closecaptioned, hdtv, preserve "
                   "FROM recorded LEFT JOIN recordedprogram ON "
                   "(recorded.chanid = recordedprogram.chanid AND "
                   "recorded.starttime = recordedprogram.starttime) "
@@ -3530 +3530 @@
         flags |= (query.value(5).toInt() == 1) ? FL_STEREO : 0;
         flags |= (query.value(6).toInt() == 1) ? FL_CC : 0;
         flags |= (query.value(7).toInt() == 1) ? FL_HDTV : 0;
+        flags |= (query.value(8).toInt() == 1) ? FL_PRESERVED : 0;
     }
 
     return flags;

programs/mythfrontend/playbackbox.cpp

@@ -786 +786 @@
         iconMap["stereo"]      = FL_STEREO;
         iconMap["cc"]          = FL_CC;
         iconMap["hdtv"]        = FL_HDTV;
+        iconMap["preserved"]   = FL_PRESERVED;
 
         UIImageType *itype;
         for (it = iconMap.begin(); it != iconMap.end(); ++it)

programs/mythbackend/mainserver.cpp

@@ -1032 +1032 @@
         "recorded.progend, recorded.stars, "
         "recordedprogram.stereo, recordedprogram.hdtv, "
         "recordedprogram.closecaptioned, transcoded, "
-        "recorded.recpriority "
+        "recorded.recpriority, recorded.preserve "
         "FROM recorded "
         "LEFT JOIN record ON recorded.recordid = record.recordid "
         "LEFT JOIN channel ON recorded.chanid = channel.chanid "
@@ -1136 +1136 @@
             flags |= (query.value(34).toInt() == 1) ? FL_CC : 0;
             flags |= (query.value(35).toInt() == TRANSCODING_COMPLETE) ?
                       FL_TRANSCODED : 0;
+            flags |= (query.value(37).toInt() == 1) ? FL_PRESERVED : 0;
 
             inUseKey = query.value(0).toString() + " " +
                        query.value(1).toDateTime().toString(Qt::ISODate);