Ticket #3291: preservepadding.patch

scheduler.h

@@ -85 +85 @@
     void BuildListMaps(void);
     void ClearListMaps(void);
     bool FindNextConflict(RecList &cardlist, ProgramInfo *p, RecIter &iter,
-                          bool openEnd = false);
+                          bool openEnd = false, bool padded = true);
     void MarkOtherShowings(ProgramInfo *p);
     void MarkShowingsList(RecList &showinglist, ProgramInfo *p);
     void BackupRecStatus(void);

scheduler.cpp

@@ -746 +746 @@
 }
 
 bool Scheduler::FindNextConflict(RecList &cardlist, ProgramInfo *p, RecIter &j,
-                                 bool openEnd)
+                                 bool openEnd, bool padded)
 {
+    int prepostroll = 0;
+    if(padded){
+        prepostroll +=(int)gContext->GetNumSetting("RecordPreRoll", 0);
+        prepostroll += (int)gContext->GetNumSetting("RecordOverTime", 0);
+    }
     for ( ; j != cardlist.end(); j++)
     {
         ProgramInfo *q = *j;
@@ -760 +765 @@
             continue;
         if (openEnd && p->chanid != q->chanid)
         {
-            if (p->recendts < q->recstartts || p->recstartts > q->recendts)
+            if (p->recendts.addSecs(prepostroll) < q->recstartts || p->recstartts > q->recendts.addSecs(prepostroll))
                 continue;
         }
         else
         {
-            if (p->recendts <= q->recstartts || p->recstartts >= q->recendts)
+            if (p->recendts.addSecs(prepostroll)  <= q->recstartts || p->recstartts >= q->recendts.addSecs(prepostroll) )
                 continue;
         }
         if (p->inputid == q->inputid && p->shareable)
@@ -862 +867 @@
     RecStatusType oldstatus = p->recstatus;
     p->recstatus = rsLaterShowing;
 
-    RecIter j = showinglist->begin();
-    for ( ; j != showinglist->end(); j++)
-    {
-        ProgramInfo *q = *j;
-        if (q == p)
-            continue;
+    bool padded = false;
+    do{  // do 2 passes of the scheduler... first with padding, then resolve conflicts by doing it without
 
-        if (q->recstatus != rsEarlierShowing &&
-            q->recstatus != rsLaterShowing &&
-            q->recstatus != rsUnknown)
-            continue;
-        if (!p->IsSameTimeslot(*q))
+        padded = !padded;
+    
+        RecIter j = showinglist->begin();
+        for ( ; j != showinglist->end(); j++)
         {
-            if (!p->IsSameProgram(*q))
+            ProgramInfo *q = *j;
+            if (q == p)
                 continue;
-            if ((p->rectype == kSingleRecord || 
-                 p->rectype == kOverrideRecord))
+    
+            if (q->recstatus != rsEarlierShowing &&
+                q->recstatus != rsLaterShowing &&
+                q->recstatus != rsUnknown)
                 continue;
-            if (q->recstartts < schedTime && p->recstartts >= schedTime)
+            if (!p->IsSameTimeslot(*q))
+            {
+                if (!p->IsSameProgram(*q))
+                    continue;
+                if ((p->rectype == kSingleRecord || 
+                     p->rectype == kOverrideRecord))
+                    continue;
+                if (q->recstartts < schedTime && p->recstartts >= schedTime)
+                    continue;
+            }
+    
+            PrintRec(q, "     #");
+            RecList &cardlist = cardlistmap[q->cardid];
+            RecIter k = cardlist.begin();
+            if (FindNextConflict(cardlist, q, k, false, padded))
+            {
+                PrintRec(*k, "        !");
                 continue;
+            }
+            padded = false; // Did it with padding no need to do second pass.
+    
+            q->recstatus = rsWillRecord;
+            MarkOtherShowings(q);
+            PrintRec(p, "     -");
+            PrintRec(q, "     +");
+            return true;
         }
+    }while(padded);
 
-        PrintRec(q, "     #");
-        RecList &cardlist = cardlistmap[q->cardid];
-        RecIter k = cardlist.begin();
-        if (FindNextConflict(cardlist, q, k))
-        {
-            PrintRec(*k, "        !");
-            continue;
-        }
-
-        q->recstatus = rsWillRecord;
-        MarkOtherShowings(q);
-        PrintRec(p, "     -");
-        PrintRec(q, "     +");
-        return true;
-    }
-
     p->recstatus = oldstatus;
     return false;
 }
@@ -910 +922 @@
 
     bool openEnd = (bool)gContext->GetNumSetting("SchedOpenEnd", 0);
 
-    RecIter i = worklist.begin();
-    while (i != worklist.end())
-    {
-        ProgramInfo *p = *i;
-        if (p->recstatus == rsRecording)
-            MarkOtherShowings(p);
-        else if (p->recstatus == rsUnknown)
+    bool padded = false;
+    do{  // do 2 passes of the scheduler... first with padding, then resolve conflicts by doing it wihtough
+
+        padded = !padded;
+
+        RecIter i = worklist.begin();
+        while (i != worklist.end())
         {
-            RecList &cardlist = cardlistmap[p->cardid];
-            RecIter k = cardlist.begin();
-            if (!FindNextConflict(cardlist, p, k, openEnd))
+            ProgramInfo *p = *i;
+            if (p->recstatus == rsRecording)
+                MarkOtherShowings(p);
+            else if (p->recstatus == rsUnknown)
             {
-                p->recstatus = rsWillRecord;
-                MarkOtherShowings(p);
-                PrintRec(p, "  +");
+                RecList &cardlist = cardlistmap[p->cardid];
+                RecIter k = cardlist.begin();
+                if (!FindNextConflict(cardlist, p, k, openEnd, padded))
+                {
+                    p->recstatus = rsWillRecord;
+                    MarkOtherShowings(p);
+                    PrintRec(p, "  +");
+                }
+                else
+                {
+                    retrylist.push_front(p);
+                    PrintRec(p, "  #");
+                    PrintRec(*k, "     !");
+                }
             }
-            else
+    
+            int lastpri = p->recpriority;
+            i++;
+            if (i == worklist.end() || lastpri != (*i)->recpriority)
             {
-                retrylist.push_front(p);
-                PrintRec(p, "  #");
-                PrintRec(*k, "     !");
+                MoveHigherRecords();
+                retrylist.clear();
             }
         }
-
-        int lastpri = p->recpriority;
-        i++;
-        if (i == worklist.end() || lastpri != (*i)->recpriority)
-        {
-            MoveHigherRecords();
-            retrylist.clear();
-        }
-    }
+    }while(padded);
 }
 
 void Scheduler::MoveHigherRecords(void)
@@ -958 +976 @@
         if (TryAnotherShowing(p))
             continue;
 
-        BackupRecStatus();
-        p->recstatus = rsWillRecord;
-        MarkOtherShowings(p);
+        bool padded = false;
+        do{  // do 2 passes of the scheduler... first with padding, then resolve conflicts by doing it wihtough
+    
+            padded = !padded;
 
-        RecList &cardlist = cardlistmap[p->cardid];
-        RecIter k = cardlist.begin();
-        for ( ; FindNextConflict(cardlist, p, k); k++)
-        {
-            if ((p->recpriority < (*k)->recpriority && !schedMoveHigher) ||
-                !TryAnotherShowing(*k))
+            BackupRecStatus();
+            p->recstatus = rsWillRecord;
+            MarkOtherShowings(p);
+
+            RecList &cardlist = cardlistmap[p->cardid];
+    
+            RecIter k = cardlist.begin();
+            for ( ; FindNextConflict(cardlist, p, k, false, padded); k++)
             {
-                RestoreRecStatus();
-                break;
+                if ((p->recpriority < (*k)->recpriority && !schedMoveHigher) ||
+                    !TryAnotherShowing(*k)) 
+                {
+                    RestoreRecStatus();
+                    break;
+                }
             }
-        }
-
-        if (p->recstatus == rsWillRecord)
-            PrintRec(p, "  +");
+            if (p->recstatus == rsWillRecord)
+            {
+                PrintRec(p, "  +");
+                padded = false; // moving conflicts worked... no need to try second pass
+            }
+        }while(padded);
     }
 }