Ticket #11207: 11207-livetv-0.25-2.patch

mythtv/programs/mythbackend/scheduler.cpp

@@ -1220 +1220 @@
 
         q->SetRecordingStatus(rsWillRecord);
         MarkOtherShowings(q);
+        if (q->GetRecordingStartTime() < livetvTime)
+            livetvTime = q->GetRecordingStartTime();
         PrintRec(p, "     -");
         PrintRec(q, "     +");
         return true;
@@ -1255 +1257 @@
             "- = unschedule a showing in favor of another one");
     }
 
+    livetvTime = QDateTime::currentDateTime().addSecs(3600);
     int openEnd = gCoreContext->GetNumSetting("SchedOpenEnd", 0);
 
     RecIter i = worklist.begin();
@@ -1270 +1273 @@
             if (!conflict)
             {
                 p->SetRecordingStatus(rsWillRecord);
-
-                if (p->GetRecordingStartTime() < schedTime.addSecs(90))
-                {
-                    QString id = p->MakeUniqueSchedulerKey();
-                    if (!recPendingList.contains(id))
-                        recPendingList[id] = false;
-
-                    livetvTime = (livetvTime < schedTime) ?
-                        schedTime : livetvTime;
-                }
-
                 MarkOtherShowings(p);
+                if (p->GetRecordingStartTime() < livetvTime)
+                    livetvTime = p->GetRecordingStartTime();
                 PrintRec(p, "  +");
             }
             else
@@ -1328 +1322 @@
         }
 
         if (p->GetRecordingStatus() == rsWillRecord)
+        {
+            if (p->GetRecordingStartTime() < livetvTime)
+                livetvTime = p->GetRecordingStartTime();
             PrintRec(p, "  +");
+        }
     }
 
     i = retrylist.begin();
@@ -1361 +1359 @@
         }
 
         if (move_this && p->GetRecordingStatus() == rsWillRecord)
+        {
+            if (p->GetRecordingStartTime() < livetvTime)
+                livetvTime = p->GetRecordingStartTime();
             PrintRec(p, "  +");
+        }
     }
 }
 
@@ -1972 +1974 @@
         int secs_to_next = curtime.secsTo((*i)->GetRecordingStartTime());
 
         if ((*i)->GetRecordingStatus() == rsWillRecord &&
-            !recPendingList[(*i)->MakeUniqueSchedulerKey()])
+            !recPendingList.contains((*i)->MakeUniqueSchedulerKey()))
             secs_to_next -= 30;
 
         if (secs_to_next < 0)
@@ -2318 +2320 @@
         if (!recPendingList.contains(schedid))
         {
             recPendingList[schedid] = false;
-
-            livetvTime = (livetvTime < nextrectime) ?
-                nextrectime : livetvTime;
-
-            m_queueLock.lock();
-            reschedQueue.enqueue(0);
-            m_queueLock.unlock();
+            if (schedTime.secsTo(curtime) > 15)
+            {
+                m_queueLock.lock();
+                reschedQueue.enqueue(0);
+                m_queueLock.unlock();
+            }
         }
     }
 
@@ -2476 +2477 @@
             schedLock.unlock();
             recStatus = nexttv->StartRecording(&tempri);
             schedLock.lock();
+            recPendingList.remove(schedid);
 
             // activate auto expirer
             if (m_expirer)
@@ -4926 +4928 @@
 
 void Scheduler::SchedPreserveLiveTV(void)
 {
-    if (!livetvTime.isValid())
-        return;
+    int prerollseconds = gCoreContext->GetNumSetting("RecordPreRoll", 0);
+    QDateTime curtime = QDateTime::currentDateTime();
+    int secsleft = curtime.secsTo(livetvTime);
 
-    if (livetvTime < schedTime)
-    {
-        livetvTime = QDateTime();
+    if (secsleft - prerollseconds > 120)
         return;
-    }
 
     livetvpriority = gCoreContext->GetNumSetting("LiveTVPriority", 0);