Ticket #1772: ajm_scheduler_v2.patch

programs/mythbackend/scheduler.cpp

@@ -417 +417 @@
          << p->chanstr.rightJustify(4, ' ') << " " << p->chanid 
          << p->recstartts.toString("  dd hh:mm-").local8Bit()
          << p->recendts.toString("hh:mm  ").local8Bit()
-         << p->cardid << " " << p->inputid << "  " 
+         << p->cardid << " " << p->inputid << " " << p->mplexid << "  "
          << p->RecTypeChar() << " " << p->RecStatusChar() << " "
          << (QString::number(p->recpriority) + "/" + 
              QString::number(p->recpriority2)).rightJustify(5, ' ')
@@ -681 +681 @@
             continue;
         if (p->recendts <= q->recstartts || p->recstartts >= q->recendts)
             continue;
+        if (p->inputid == q->inputid && p->mplexid == q->mplexid)   // if mplex ids are the same don't conflict
+            continue;
         if (p->inputid == q->inputid && p->shareable)
             continue;
 
@@ -1320 +1322 @@
                 continue;
             }
 
+            // SPLIT need a EncoderLink::IsBusyRecordingDifferentMux()
+            //if (!nexttv->IsBusyRecording())
+            VERBOSE(VB_RECORD, LOC + "Before IsBusyRecordingAndNotShareable");
+            //if (!nexttv->IsBusyRecordingAndNotShareable(nextRecording))
             if (!nexttv->IsBusyRecording())
             {
-                // Will use pre-roll settings only if no other
-                // program is currently being recorded
+                VERBOSE(VB_RECORD, LOC + "During IsBusyRecordingAndNotShareable");
+                // Will use pre-roll settings only if the
+                // recorder is recording on the same mux
                 secsleft -= prerollseconds;
             }
+            VERBOSE(VB_RECORD, LOC + "After IsBusyRecordingAndNotShareable");
 
             //VERBOSE(VB_GENERAL, secsleft << " seconds until " << nextRecording->title);
 
@@ -2020 +2028 @@
 "program.airdate, program.stars, program.originalairdate, RECTABLE.inactive, "
 "RECTABLE.parentid, ") + progfindid + ", RECTABLE.playgroup, "
 "oldrecstatus.recstatus, oldrecstatus.reactivate, " 
-"channel.recpriority + cardinput.recpriority, program.hdtv "
+"channel.recpriority + cardinput.recpriority, program.hdtv, "
+"channel.mplexid "
 + QString(
 "FROM recordmatch "
 
@@ -2158 +2167 @@
         p->chancommfree = result.value(23).toInt();
         p->cardid = result.value(24).toInt();
         p->inputid = result.value(25).toInt();
+        p->mplexid = result.value(41).toInt();
         p->shareable = result.value(26).toInt();
         p->seriesid = result.value(27).toString();
         p->programid = result.value(28).toString();
@@ -2277 +2287 @@
 "RECTABLE.starttime, RECTABLE.startdate, RECTABLE.endtime, RECTABLE.enddate, "
 "RECTABLE.startoffset, RECTABLE.endoffset, "
 "RECTABLE.title, RECTABLE.subtitle, RECTABLE.description, "
-"channel.channum, channel.callsign, channel.name "
+"channel.channum, channel.callsign, channel.name, channel.mplexid "
 "FROM RECTABLE "
 " INNER JOIN channel ON (channel.chanid = RECTABLE.chanid) "
 " LEFT JOIN recordmatch on RECTABLE.recordid = recordmatch.recordid "
@@ -2348 +2358 @@
         p->chanstr = result.value(12).toString();
         p->chansign = QString::fromUtf8(result.value(13).toString());
         p->channame = QString::fromUtf8(result.value(14).toString());
+        p->mplexid = result.value(15).toInt();
 
         p->schedulerid = p->startts.toString() + "_" + p->chanid;
 
@@ -2371 +2382 @@
 "channel.name, RECTABLE.recordid, RECTABLE.recgroup, RECTABLE.dupin, "
 "RECTABLE.dupmethod, channel.commfree, channel.channum, RECTABLE.station, "
 "RECTABLE.seriesid, RECTABLE.programid, RECTABLE.category, RECTABLE.findid, "
-"RECTABLE.playgroup "
+"RECTABLE.playgroup, channel.mplexid "
 "FROM RECTABLE "
 "LEFT JOIN channel ON channel.callsign = RECTABLE.station "
 "GROUP BY recordid "
@@ -2447 +2458 @@
             proginfo->programid = result.value(19).toString();
             proginfo->category = result.value(20).toString();
             proginfo->findid = result.value(21).toInt();
+            proginfo->mplexid = result.value(23).toInt();
             
             proginfo->recstartts = proginfo->startts;
             proginfo->recendts = proginfo->endts;

libs/libmythtv/programinfo.cpp

@@ -104 +104 @@
     sourceid = 0;
     inputid = 0;
     cardid = 0;
+    mplexid = 0;
     shareable = false;
     duplicate = false;
     schedulerid = "";
@@ -195 +196 @@
     sourceid = other.sourceid;
     inputid = other.inputid;
     cardid = other.cardid;
+    mplexid = other.mplexid;
     shareable = other.shareable;
     duplicate = other.duplicate;
     schedulerid = QDeepCopy<QString>(other.schedulerid);
@@ -283 +285 @@
     STR_TO_LIST(hostname)
     INT_TO_LIST(sourceid)
     INT_TO_LIST(cardid)
+    INT_TO_LIST(mplexid)
     INT_TO_LIST(inputid)
     INT_TO_LIST(recpriority)
     INT_TO_LIST(recstatus)
@@ -381 +384 @@
     STR_FROM_LIST(hostname)
     INT_FROM_LIST(sourceid)
     INT_FROM_LIST(cardid)
+    INT_FROM_LIST(mplexid)
     INT_FROM_LIST(inputid)
     INT_FROM_LIST(recpriority)
     ENUM_FROM_LIST(recstatus, RecStatusType)
@@ -2984 +2988 @@
         recstartts = found->recstartts;
         recendts = found->recendts;
         cardid = found->cardid;
+        mplexid = found->mplexid;
         inputid = found->inputid;
     }
     return found;
@@ -4085 +4090 @@
                 p->recstartts = s->recstartts;
                 p->recendts = s->recendts;
                 p->cardid = s->cardid;
+                p->mplexid = s->mplexid;
                 p->inputid = s->inputid;
                 p->dupin = s->dupin;
                 p->dupmethod = s->dupmethod;

libs/libmythtv/programinfo.h

@@ -300 +300 @@
     int sourceid;
     int inputid;
     int cardid;
+    int mplexid;
     bool shareable;
     bool duplicate;
 

programs/mythbackend/encoderlink.cpp

@@ -122 +122 @@
     return retval;
 }
 
+/** \fn EncoderLink::IsBusyRecordingAndNotShareable()
+ *  \brief Returns true if the TVRec state is in a recording state and not shareable with rec
+ *
+ *   Contrast with IsBusyRecording() which returns true if it is recording.
+ *
+ *  \sa IsBusyRecording()
+ */
+bool EncoderLink::IsBusyRecordingAndNotShareable(const ProgramInfo *rec)
+{
+    bool retval = false;
+    ProgramList tvrecList;
+
+    if (local)
+    {
+        while (kState_ChangingState == GetState())
+            usleep(100);
+
+        if (IsBusyRecording())
+            tvrecList = tv->GetRecordings();
+
+        if (!tvrecList.isEmpty())
+        {
+            ProgramInfo *tvrec = tvrecList.first();
+            retval = (tvrec->mplexid != rec->mplexid);
+
+            tvrecList.setAutoDelete(true);
+        }
+    }
+    else if (sock)
+        retval = sock->EncoderIsRecording(m_capturecardnum, rec);
+
+    return retval;
+}
+
 /** \fn EncoderLink::GetState()
  *  \brief Returns the TVState of the recorder.
  *  \sa TVRec::GetState(), \ref recorder_subsystem

programs/mythbackend/encoderlink.h

@@ -52 +52 @@
 
     bool IsBusy(void);
     bool IsBusyRecording(void);
+    bool IsBusyRecordingAndNotShareable(const ProgramInfo *rec);
 
     TVState GetState();
     bool IsRecording(const ProgramInfo *rec); // scheduler call only.