Ticket #12285: do_not_filter_preview.patch

File do_not_filter_preview.patch, 1.8 KB (added by Roger Siddons <dizygotheca@…>, 12 years ago)

Don't filter schedules produced for Edit Schedule/Preview

  • mythtv/libs/libmyth/programinfo.h

    diff --git a/mythtv/libs/libmyth/programinfo.h b/mythtv/libs/libmyth/programinfo.h
    index 421e5cf..1340683 100644
    a b bool LoadFromScheduler(  
    809809    AutoDeleteDeque<TYPE*> &destination,
    810810    bool               &hasConflicts,
    811811    QString             altTable = "",
    812     int                 recordid = -1)
     812    int                 recordid = -1,
     813    bool                filter = true)
    813814{
    814815    destination.clear();
    815816    QList<TYPE> tmpList;
    bool LoadFromScheduler(  
    837838        tmpList.push_back(*p);
    838839        programCount++;
    839840
    840         if (recordid > 0 && p->GetRecordingRuleID() != static_cast<uint>(recordid))
     841        if (filter && recordid > 0 && p->GetRecordingRuleID() != static_cast<uint>(recordid))
    841842        {
    842843            delete p;
    843844            continue;
    template<typename T>  
    880881bool LoadFromScheduler(AutoDeleteDeque<T> &destination)
    881882{
    882883    bool dummyConflicts;
    883     return LoadFromScheduler(destination, dummyConflicts, "", -1);
     884    return LoadFromScheduler(destination, dummyConflicts, "", -1, true);
    884885}
    885886
    886887// Moved from programdetails.cpp/h, used by MythWelcome/MythShutdown
  • mythtv/programs/mythfrontend/viewschedulediff.cpp

    diff --git a/mythtv/programs/mythfrontend/viewschedulediff.cpp b/mythtv/programs/mythfrontend/viewschedulediff.cpp
    index c0218df..3e9ddd7 100644
    a b void ViewScheduleDiff::fillList(void)  
    197197    bool dummy;
    198198
    199199    LoadFromScheduler(m_recListBefore, dummy);
    200     LoadFromScheduler(m_recListAfter,  dummy, m_altTable, m_recordid);
     200    LoadFromScheduler(m_recListAfter,  dummy, m_altTable, m_recordid, false);
    201201
    202202    std::stable_sort(m_recListBefore.begin(), m_recListBefore.end(),
    203203                     comp_recstart_less_than);