Ticket #1633: sched1.2.patch
File sched1.2.patch, 944 bytes (added by , 18 years ago) |
---|
-
programs/mythbackend/scheduler.cpp
778 778 if (q == p) 779 779 continue; 780 780 781 PrintRec(q, " 1"); 781 782 if (q->recstatus != rsEarlierShowing && 782 783 q->recstatus != rsLaterShowing) 783 784 continue; 785 PrintRec(q, " 2"); 784 786 if (!p->IsSameTimeslot(*q)) 785 787 { 786 788 if (!p->IsSameProgram(*q)) … … 792 794 continue; 793 795 } 794 796 797 PrintRec(q, " 3"); 795 798 RecList &cardlist = cardlistmap[q->cardid]; 796 799 RecIter k = cardlist.begin(); 797 800 if (FindNextConflict(cardlist, q, k)) 801 { 802 PrintRec(*k, " ="); 798 803 continue; 804 } 799 805 800 806 q->recstatus = rsWillRecord; 801 807 MarkOtherShowings(q);