Ticket #10490: 10490-debug-v2.patch

mythtv/libs/libmythtv/tv_rec.cpp

@@ -778 +778 @@
         return;
 
     curRec->StartedRecording(rbFileExt);
-    LOG(VB_RECORD, LOG_INFO, LOC + QString("StartedRecording(0x%1) fn(%2)")
-            .arg((uint64_t)curRec,0,16).arg(curRec->GetPathname()));
+    LOG(VB_RECORD, LOG_INFO, LOC + QString("StartedRecording(%1) fn(%2)")
+        .arg(curRec->MakeUniqueKey()).arg(curRec->GetPathname()));
 
     if (curRec->IsCommercialFree())
         curRec->SaveCommFlagged(COMM_FLAG_COMMFREE);
@@ -806 +806 @@
     if (recq)
     {
         LOG((recq->IsDamaged()) ? VB_GENERAL : VB_RECORD, LOG_INFO,
-            QString("TVRec::FinishedRecording(%1) %2 recq:%3\n")
-            .arg(curRec->GetTitle())
+            LOC + QString("FinishedRecording(%1) %2 recq:%3\n")
+            .arg(curRec->MakeUniqueKey())
             .arg((recq->IsDamaged()) ? "damaged" : "good")
             .arg(recq->toStringXML()));
         is_good = !recq->IsDamaged();
@@ -851 +851 @@
     // Print something informative to the log
     LOG(VB_RECORD, LOG_INFO, LOC +
         QString("FinishedRecording(%1)"
-                "\n\t\t\tkey: %2\n\t\t\t"
+                "\n\t\t\ttitle: %2\n\t\t\t"
                 "in recgroup: %3 status: %4:%5 %6 %7")
-            .arg(curRec->GetTitle())
             .arg(curRec->MakeUniqueKey())
+            .arg(curRec->GetTitle())
             .arg(recgrp)
             .arg(toString(ors, kSingleRecord))
             .arg(toString(curRec->GetRecordingStatus(), kSingleRecord))
@@ -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)
                 {
+                    LOG(VB_RECORD, LOG_INFO, LOC +
+                        "Switching Buffer (" +
+                        QString("!has_rec(%1) && ").arg(has_rec) +
+                        QString("!rec_soon(%1) && (").arg(rec_soon) +
+                        now.toString(Qt::ISODate) + " >= " +
+                        curRecording->GetScheduledEndTime(ISODate) +
+                        QString("(%1) || ")
+                        .arg(now >= curRecording->GetScheduledEndTime()) +
+                        QString("debug_start_new(%1) ))")
+                                              .arg(debug_start_new));
+
                     switchingBuffer = true;
 
                     SwitchLiveTVRingBuffer(channel->GetCurrentName(),
                                            false, true);
-
-                    QDateTime starttime; starttime.setTime_t(0);
-                    if (curRecording)
-                        starttime = curRecording->GetRecordingStartTime();
-
-                    LOG(VB_RECORD, LOG_INFO, LOC +
-                        QString("!has_rec(%1) ").arg(!has_rec) +
-                        QString("!rec_soon(%1) ").arg(!rec_soon) +
-                        QString("curRec(0x%1) ")
-                            .arg((uint64_t)curRecording,0,16) +
-                        QString("starttm(%1)")
-                            .arg(starttime.toString(Qt::ISODate)));
                 }
                 else
                 {
@@ -4409 +4419 @@
 bool TVRec::SwitchLiveTVRingBuffer(const QString & channum,
                                    bool discont, bool set_rec)
 {
+    QString msg;
+    if (curRecording)
+    {
+        msg = QString(" curRec(%1) curRec.size(%2)")
+            .arg(curRecording->MakeUniqueKey())
+            .arg(curRecording->GetFilesize());
+    }
     LOG(VB_RECORD, LOG_INFO, LOC +
-        QString("SwitchLiveTVRingBuffer(discont %1, set_rec %2")
-            .arg(discont).arg(set_rec));
+        QString("SwitchLiveTVRingBuffer(discont %1, set_next_rec %2)")
+        .arg(discont).arg(set_rec) + msg);
 
     RecordingInfo *pginfo = NULL;
     RingBuffer    *rb = NULL;
@@ -4433 +4450 @@
         return false;
     }
 
-    ProgramInfo *pi = tvchain->GetProgramAt(-1);
-    if (pi)
-    {
-        RecordingInfo *oldinfo = new RecordingInfo(*pi);
-        delete pi;
-        FinishedRecording(oldinfo, NULL);
-        delete oldinfo;
-    }
+    QString oldcardtype = tvchain->GetCardType(-1);
 
     pginfo->MarkAsInUse(true, kRecorderInUseID);
     pginfo->SaveAutoExpire(kLiveTVAutoExpire);
@@ -4458 +4468 @@
     }
     else if (!set_rec)
     {
-        if (curRecording)
+        // dummy recordings are finished before this
+        // is called and other recordings must be finished..
+        if (curRecording && oldcardtype != "DUMMY")
         {
+            FinishedRecording(curRecording, NULL);
             curRecording->MarkAsInUse(false, kRecorderInUseID);
             delete curRecording;
         }

mythtv/libs/libmythtv/tv_rec.h

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