Ticket #3031: 3031-dbg-1.patch

libs/libmythtv/dvbrecorder.cpp

@@ -192 +192 @@
 {
     if (!_pat)
     {
-        VERBOSE(VB_RECORD, LOC + "SetPAT(NULL)");
+        VERBOSE(VB_RECORD, LOC + "HandlePAT(NULL)");
         return;
     }
 
@@ -203 +203 @@
 
     if (!pmtpid)
     {
-        VERBOSE(VB_RECORD, LOC + "SetPAT(): "
-                "Ignoring PAT not containing our desired program...");
+        VERBOSE(VB_RECORD, LOC + "HandlePAT(): Ignoring PAT not "
+                <<QString("containing our desired program %1").arg(progNum)
+                <<"\n"<<_pat->toString()<<"\n");
+
         return;
     }
 
     _pmt_pid = pmtpid;
 
-    VERBOSE(VB_RECORD, LOC + QString("SetPAT(%1 on 0x%2)")
+    VERBOSE(VB_RECORD, LOC + QString("HandlePAT(%1 on 0x%2)")
             .arg(progNum).arg(_pmt_pid,0,16));
 
     ProgramAssociationTable *oldpat = _input_pat;
@@ -230 +232 @@
 
     if ((int)progNum == _stream_data->DesiredProgram())
     {
-        VERBOSE(VB_RECORD, LOC + "SetPMT("<<progNum<<")");
+        VERBOSE(VB_RECORD, LOC + "HandlePMT("<<progNum<<")");
         ProgramMapTable *oldpmt = _input_pmt;
         _input_pmt = new ProgramMapTable(*_pmt);
         dvbchannel->SetPMT(_input_pmt);
@@ -242 +244 @@
 
         _reset_pid_filters = true;
     }
+    else
+    {
+        VERBOSE(VB_RECORD, LOC + "HandlePMT("<<progNum<<"): No match"
+                <<"\n"<<_pmt->toString()<<"\n");
+    }
 }
 
 void DVBRecorder::HandleSTT(const SystemTimeTable*)

libs/libmythtv/hdhrrecorder.cpp

@@ -185 +185 @@
 {
     if (!_pat)
     {
-        VERBOSE(VB_RECORD, LOC + "SetPAT(NULL)");
+        VERBOSE(VB_RECORD, LOC + "HandlePAT(NULL)");
         return;
     }
 
@@ -196 +196 @@
 
     if (!pmtpid)
     {
-        VERBOSE(VB_RECORD, LOC + "SetPAT(): "
-                "Ignoring PAT not containing our desired program...");
+        VERBOSE(VB_RECORD, LOC + "HandlePAT(): Ignoring PAT not "
+                <<QString("containing our desired program %1").arg(progNum)
+                <<"\n"<<_pat->toString()<<"\n");
+
         return;
     }
 
-    VERBOSE(VB_RECORD, LOC + QString("SetPAT(%1 on 0x%2)")
+    VERBOSE(VB_RECORD, LOC + QString("HandlePAT(%1 on 0x%2)")
             .arg(progNum).arg(pmtpid,0,16));
 
     ProgramAssociationTable *oldpat = _input_pat;
@@ -217 +219 @@
 
     if ((int)progNum == _stream_data->DesiredProgram())
     {
-        VERBOSE(VB_RECORD, LOC + "SetPMT("<<progNum<<")");
+        VERBOSE(VB_RECORD, LOC + "HandlePMT("<<progNum<<")");
         ProgramMapTable *oldpmt = _input_pmt;
         _input_pmt = new ProgramMapTable(*_pmt);
         delete oldpmt;
 
         _reset_pid_filters = true;
     }
+    else
+    {
+        VERBOSE(VB_RECORD, LOC + "HandlePMT("<<progNum<<") no match"
+                <<"\n"<<_pmt->toString()<<"\n");
+    }
 }
 
 void HDHRRecorder::HandleSingleProgramPAT(ProgramAssociationTable *pat)

libs/libmythtv/dtvsignalmonitor.cpp

@@ -278 +278 @@
     int pmt_pid = pat->FindPID(programNumber);
     if (GetStreamData() && pmt_pid)
     {
+        VERBOSE(VB_RECORD, LOC + "HandlePAT() found program "<<programNumber
+                <<"\n"<<pat->toString()<<"\n");
+
         AddFlags(kDTVSigMon_PATMatch);
         GetStreamData()->AddListeningPID(pmt_pid);
         return;
@@ -322 +325 @@
         return; // Not the PMT we are looking for...
     }
 
+    VERBOSE(VB_RECORD, LOC + "HandlePMT() found program "<<programNumber
+            <<"\n"<<pmt->toString()<<"\n");
+
     if (pmt->IsEncrypted())
         GetStreamData()->TestDecryption(pmt);