Ticket #8429: mythtv.SchedOpenEnd-allchan.patch

mythtv/programs/mythbackend/scheduler.cpp

@@ -827 +827 @@
     const RecList     &cardlist,
     const RecordingInfo *p,
     RecConstIter      &j,
-    bool               openEnd) const
+    int               openEnd) const
 {
     bool is_conflict_dbg = false;
 
@@ -853 +853 @@
             continue;
         }
 
-        if (openEnd && p->chanid != q->chanid)
+        // H O O K: Should change openEnd to be a number to indicate off, different channel, or any back to back
+        if ((openEnd == 1 && p->chanid != q->chanid) || openEnd == 2)
         {
             if (p->recendts < q->recstartts || p->recstartts > q->recendts)
             {
@@ -905 +906 @@
 const RecordingInfo *Scheduler::FindConflict(
     const QMap<int, RecList> &reclists,
     const RecordingInfo        *p,
-    bool openend) const
+    int openend) const
 {
     bool is_conflict_dbg = false;
 
@@ -1122 +1123 @@
 {
     VERBOSE(VB_SCHEDULE, "Scheduling:");
 
-    bool openEnd = (bool)gContext->GetNumSetting("SchedOpenEnd", 0);
+    int openEnd = gContext->GetNumSetting("SchedOpenEnd", 0);
 
     RecIter i = worklist.begin();
     while (i != worklist.end())

mythtv/programs/mythbackend/scheduler.h

@@ -114 +114 @@
 
     bool FindNextConflict(const RecList &cardlist,
                           const RecordingInfo *p, RecConstIter &iter,
-                          bool openEnd = false) const;
+                          int openEnd = 0) const;
     const RecordingInfo *FindConflict(const QMap<int, RecList> &reclists,
-                                    const RecordingInfo *p, bool openEnd = false) const;
+                                    const RecordingInfo *p, int openEnd = 0) const;
     void MarkOtherShowings(RecordingInfo *p);
     void MarkShowingsList(RecList &showinglist, RecordingInfo *p);
     void BackupRecStatus(void);