Ticket #2124: preservediff.diff

File preservediff.diff, 3.4 KB (added by rich@…, 14 years ago)

patch

  • themes/blue/ui.xml

     
    889889        <position>20,106</position>
    890890      </image>
    891891
     892      <image name="preserved" draworder="6">
     893        <filename>type/preserve.png</filename>
     894        <position>289,106</position>
     895      </image>
     896     
     897
    892898    </container>
    893899
    894900    <container name="program_info_del">
  • libs/libmythtv/programinfo.h

     
    5555    FL_STEREO         = 0x080,
    5656    FL_CC             = 0x100,
    5757    FL_HDTV           = 0x200,
    58     FL_TRANSCODED     = 0x400
     58    FL_TRANSCODED     = 0x400,
     59    FL_PRESERVED      = 0x800
    5960};
    6061
    6162enum RecStatusType {
  • libs/libmythtv/programinfo.cpp

     
    35083508    MSqlQuery query(MSqlQuery::InitCon());
    35093509
    35103510    query.prepare("SELECT commflagged, cutlist, autoexpire, "
    3511                   "editing, bookmark, stereo, closecaptioned, hdtv "
     3511                  "editing, bookmark, stereo, closecaptioned, hdtv, preserve "
    35123512                  "FROM recorded LEFT JOIN recordedprogram ON "
    35133513                  "(recorded.chanid = recordedprogram.chanid AND "
    35143514                  "recorded.starttime = recordedprogram.starttime) "
     
    35303530        flags |= (query.value(5).toInt() == 1) ? FL_STEREO : 0;
    35313531        flags |= (query.value(6).toInt() == 1) ? FL_CC : 0;
    35323532        flags |= (query.value(7).toInt() == 1) ? FL_HDTV : 0;
     3533        flags |= (query.value(8).toInt() == 1) ? FL_PRESERVED : 0;
    35333534    }
    35343535
    35353536    return flags;
  • programs/mythfrontend/playbackbox.cpp

     
    786786        iconMap["stereo"]      = FL_STEREO;
    787787        iconMap["cc"]          = FL_CC;
    788788        iconMap["hdtv"]        = FL_HDTV;
     789        iconMap["preserved"]   = FL_PRESERVED;
    789790
    790791        UIImageType *itype;
    791792        for (it = iconMap.begin(); it != iconMap.end(); ++it)
  • programs/mythbackend/mainserver.cpp

     
    10321032        "recorded.progend, recorded.stars, "
    10331033        "recordedprogram.stereo, recordedprogram.hdtv, "
    10341034        "recordedprogram.closecaptioned, transcoded, "
    1035         "recorded.recpriority "
     1035        "recorded.recpriority, recorded.preserve "
    10361036        "FROM recorded "
    10371037        "LEFT JOIN record ON recorded.recordid = record.recordid "
    10381038        "LEFT JOIN channel ON recorded.chanid = channel.chanid "
     
    11361136            flags |= (query.value(34).toInt() == 1) ? FL_CC : 0;
    11371137            flags |= (query.value(35).toInt() == TRANSCODING_COMPLETE) ?
    11381138                      FL_TRANSCODED : 0;
     1139            flags |= (query.value(37).toInt() == 1) ? FL_PRESERVED : 0;
    11391140
    11401141            inUseKey = query.value(0).toString() + " " +
    11411142                       query.value(1).toDateTime().toString(Qt::ISODate);