Ticket #10490: 10490-debug.patch

mythtv/libs/libmythtv/tv_rec.cpp

@@ -1300 +1300 @@
                 pendingRecordings.find(cardid) != pendingRecordings.end();
             pendingRecLock.unlock();
 
+            const int time_out = 30;
+            bool debug_start_new = false;
+            if (!debugNextRecTime.isValid())
+                debugNextRecTime = now.addSecs(time_out+90);
+            if (now >= debugNextRecTime)
+            {
+                debug_start_new = true;
+                debugNextRecTime = now.addSecs(time_out);
+            }
+
             if (has_rec && (has_finish || (now > recordEndTime)))
             {
                 SetPseudoLiveTVRecording(NULL);
             }
             else if (!has_rec && !rec_soon && curRecording &&
-                     (now >= curRecording->GetScheduledEndTime()))
+                     (now >= curRecording->GetScheduledEndTime() ||
+                      debug_start_new))
             {
                 if (!switchingBuffer)
                 {
@@ -3913 +3924 @@
 {
     LOG(VB_RECORD, LOG_INFO, LOC + "Starting Recorder");
 
-    bool had_dummyrec = false;
-    if (HasFlags(kFlagDummyRecorderRunning))
-    {
-        FinishedRecording(curRecording, NULL);
-        ClearFlags(kFlagDummyRecorderRunning);
-        curRecording->MarkAsInUse(false, kRecorderInUseID);
-        had_dummyrec = true;
-    }
+    bool had_dummyrec = HasFlags(kFlagDummyRecorderRunning);
 
     RecordingInfo *rec = lastTuningRequest.program;
 
@@ -3932 +3936 @@
         bool ok;
         if (!ringBuffer)
         {
+            if (had_dummyrec)
+            {
+                FinishedRecording(curRecording, NULL);
+                curRecording->MarkAsInUse(false, kRecorderInUseID);
+            }
             ok = CreateLiveTVRingBuffer(channel->GetCurrentName());
             SetFlags(kFlagRingBufferReady);
         }
         else
+        {
             ok = SwitchLiveTVRingBuffer(channel->GetCurrentName(),
                                         true, !had_dummyrec && recorder);
+        }
+        ClearFlags(kFlagDummyRecorderRunning);
         if (!ok)
         {
             LOG(VB_GENERAL, LOG_ERR, LOC + "Failed to create RingBuffer 2");
@@ -3945 +3957 @@
         }
         rec = curRecording;  // new'd in Create/SwitchLiveTVRingBuffer()
     }
+    else if (had_dummyrec)
+    {
+        FinishedRecording(curRecording, NULL);
+        ClearFlags(kFlagDummyRecorderRunning);
+        curRecording->MarkAsInUse(false, kRecorderInUseID);
+    }
 
     if (lastTuningRequest.flags & kFlagRecording)
     {
@@ -4439 +4457 @@
         RecordingInfo *oldinfo = new RecordingInfo(*pi);
         delete pi;
         FinishedRecording(oldinfo, NULL);
+        oldinfo->MarkAsInUse(false, kRecorderInUseID);
         delete oldinfo;
     }
 

mythtv/libs/libmythtv/tv_rec.h

@@ -387 +387 @@
 
     // LiveTV file chain
     LiveTVChain *tvchain;
+    QDateTime debugNextRecTime;
 
     // RingBuffer info
     RingBuffer  *ringBuffer;