Ticket #12267: recordingRules.diff

File recordingRules.diff, 3.2 KB (added by lomion@…, 10 years ago)

  • mythtv/programs/mythfrontend/programrecpriority.cpp 

    diff --git a/mythtv/programs/mythfrontend/programrecpriority.cpp b/mythtv/programs/mythfrontend/programrecpriority.cpp
index 22e561a..2cc2233 100644
    a b void ProgramRecPriority::UpdateList() (this hunk was shorter than expected) 
    14831483        item->SetText(tempTime, "lastrecordedtime", state);
    14841484
    14851485        QString channame = progInfo->channame;
    1486         if ((progInfo->recType == kAllRecord) ||
    1487             (progInfo->recType == kOneRecord) ||
    1488             (progInfo->recType == kDailyRecord) ||
    1489             (progInfo->recType == kWeeklyRecord))
    1490             channame = tr("Any");
     1486        if (!(progInfo->GetRecordingRule()->m_filter & 1024)) channame = tr("Any");
    14911487        item->SetText(channame, "channel", state);
    14921488        QString channum = progInfo->chanstr;
    1493         if ((progInfo->recType == kAllRecord) ||
    1494             (progInfo->recType == kOneRecord) ||
    1495             (progInfo->recType == kDailyRecord) ||
    1496             (progInfo->recType == kWeeklyRecord))
    1497             channum = tr("Any");
     1489        if (!(progInfo->GetRecordingRule()->m_filter & 1024)) channum = tr("Any");
    14981490        item->SetText(channum, "channum", state);
    14991491        QString callsign = progInfo->chansign;
    1500         if ((progInfo->recType == kAllRecord) ||
    1501             (progInfo->recType == kOneRecord) ||
    1502             (progInfo->recType == kDailyRecord) ||
    1503             (progInfo->recType == kWeeklyRecord))
    1504             callsign = tr("Any");
     1492        if (!(progInfo->GetRecordingRule()->m_filter & 1024)) callsign = tr("Any");
    15051493        item->SetText(callsign, "callsign", state);
    15061494
    15071495        QString profile = progInfo->profile;
    … … void ProgramRecPriority::updateInfo(MythUIButtonListItem *item) 
    16031606    if (m_channameText)
    16041607    {
    16051608        QString channame = pgRecInfo->channame;
    1606         if ((pgRecInfo->rectype == kAllRecord) ||
    1607             (pgRecInfo->rectype == kOneRecord) ||
    1608             (pgRecInfo->rectype == kDailyRecord) ||
    1609             (pgRecInfo->rectype == kWeeklyRecord))
    1610             channame = tr("Any");
     1609        if (!(pgRecInfo->GetRecordingRule()->m_filter & 1024)) channame = tr("Any");
    16111610        m_channameText->SetText(channame);
    16121611    }
    16131612
    16141613    if (m_channumText)
    16151614    {
    16161615        QString channum = pgRecInfo->chanstr;
    1617         if ((pgRecInfo->rectype == kAllRecord) ||
    1618             (pgRecInfo->rectype == kOneRecord) ||
    1619             (pgRecInfo->rectype == kDailyRecord) ||
    1620             (pgRecInfo->rectype == kWeeklyRecord))
    1621             channum = tr("Any");
     1616        if (!(pgRecInfo->GetRecordingRule()->m_filter & 1024)) channum = tr("Any");
    16221617        m_channumText->SetText(channum);
    16231618    }
    16241619
    16251620    if (m_callsignText)
    16261621    {
    16271622        QString callsign = pgRecInfo->chansign;
    1628         if ((pgRecInfo->rectype == kAllRecord) ||
    1629             (pgRecInfo->rectype == kOneRecord) ||
    1630             (pgRecInfo->rectype == kDailyRecord) ||
    1631             (pgRecInfo->rectype == kWeeklyRecord))
    1632             callsign = tr("Any");
     1623        if (!pgRecInfo->GetRecordingRule()->m_filter & 1024) callsign = tr("Any");
    16331624        m_callsignText->SetText(callsign);
    16341625    }
    16351626