Ticket #11489: signalmonitor-debug.patch

mythtv/libs/libmythtv/dtvsignalmonitor.cpp

@@ -537 +537 @@
 bool DTVSignalMonitor::IsAllGood(void) const
 {
     QMutexLocker locker(&statusLock);
-    if (!SignalMonitor::IsAllGood())
+    DBG_SM("DTVSignalMonitor::IsAllGood", sm_flags_to_string(flags));
+    if (!SignalMonitor::IsAllGood()) {
+        DBG_SM("DTVSignalMonitor::IsAllGood", "!SignalMonitor::IsAllGood()");
         return false;
-    if ((flags & kDTVSigMon_WaitForPAT) && !matchingPAT.IsGood())
-            return false;
-    if ((flags & kDTVSigMon_WaitForPMT) && !matchingPMT.IsGood())
-            return false;
-    if ((flags & kDTVSigMon_WaitForMGT) && !matchingMGT.IsGood())
-            return false;
-    if ((flags & kDTVSigMon_WaitForVCT) && !matchingVCT.IsGood())
-            return false;
-    if ((flags & kDTVSigMon_WaitForNIT) && !matchingNIT.IsGood())
-            return false;
-    if ((flags & kDTVSigMon_WaitForSDT) && !matchingSDT.IsGood())
+    }
+    if ((flags & kDTVSigMon_WaitForPAT) && !matchingPAT.IsGood()) {
+            DBG_SM("DTVSignalMonitor::IsAllGood", "!matchingPAT.IsGood()");
+            return false;
+    }
+    if ((flags & kDTVSigMon_WaitForPMT) && !matchingPMT.IsGood()) {
+            DBG_SM("DTVSignalMonitor::IsAllGood", "!matchingPMT.IsGood()");
+            return false;
+    }
+    if ((flags & kDTVSigMon_WaitForMGT) && !matchingMGT.IsGood()) {
+            DBG_SM("DTVSignalMonitor::IsAllGood", "!matchingMGT.IsGood()");
+            return false;
+    }
+    if ((flags & kDTVSigMon_WaitForVCT) && !matchingVCT.IsGood()) {
+            DBG_SM("DTVSignalMonitor::IsAllGood", "!matchingVCT.IsGood()");
+            return false;
+    }
+    if ((flags & kDTVSigMon_WaitForNIT) && !matchingNIT.IsGood()) {
+            DBG_SM("DTVSignalMonitor::IsAllGood", "!matchingNIT.IsGood()");
+            return false;
+    }
+    if ((flags & kDTVSigMon_WaitForSDT) && !matchingSDT.IsGood()) {
+            DBG_SM("DTVSignalMonitor::IsAllGood", "!matchingSDT.IsGood()");
             return false;
+    }
     if ((flags & kDTVSigMon_WaitForCrypt) && !matchingCrypt.IsGood())
+            DBG_SM("DTVSignalMonitor::IsAllGood", "!matchingCrypt.IsGood()");
             return false;
+    }
 
+    DBG_SM("DTVSignalMonitor::IsAllGood", "Success");
     return true;
 }

mythtv/libs/libmythtv/hdhrsignalmonitor.cpp

@@ -113 +113 @@
     uint sig = status.signal_strength;
     uint snq = status.signal_to_noise_quality;
     uint seq = status.symbol_error_quality;
+    boot_t locked = status.lock_supported;
 
-    (void) snq; // TODO should convert to S/N
-    (void) seq; // TODO should report this...
-
-    LOG(VB_RECORD, LOG_DEBUG, LOC + "Tuner status: " + QString("'%1:%2:%3'")
-            .arg(sig).arg(snq).arg(seq));
+    LOG(VB_RECORD, LOG_DEBUG, LOC + "Tuner status: " + QString("'%1:%2:%3:%4'")
+            .arg(sig).arg(snq).arg(seq).arg(locked));
 
     // Set SignalMonitorValues from info from card.
     bool isLocked = false;
     {
         QMutexLocker locker(&statusLock);
         signalStrength.SetValue(sig);
-        signalLock.SetValue(status.lock_supported);
+        signalLock.SetValue(locked);
         isLocked = signalLock.IsGood();
     }
 

mythtv/libs/libmythtv/signalmonitor.cpp

@@ -216 +216 @@
 
 void SignalMonitor::AddFlags(uint64_t _flags)
 {
-    DBG_SM("AddFlags", sm_flags_to_string(_flags));
     flags |= _flags;
+    DBG_SM("AddFlags", QString("%1 == %2").arg(sm_flags_to_string(_flags))
+                                .arg(sm_flags_to_string(flags)));
 }
 
 void SignalMonitor::RemoveFlags(uint64_t _flags)
 {
-    DBG_SM("RemoveFlags", sm_flags_to_string(_flags));
     flags &= ~_flags;
+    DBG_SM("RemoveFlags", QString("%1 == %2").arg(sm_flags_to_string(_flags))
+                                .arg(sm_flags_to_string(flags)));
 }
 
 bool SignalMonitor::HasFlags(uint64_t _flags) const

mythtv/libs/libmythtv/signalmonitor.h

@@ -69 +69 @@
     bool HasSignalLock(void) const
     {
         QMutexLocker locker(&statusLock);
-        return scriptStatus.IsGood() && signalLock.IsGood();
+        bool s = scriptStatus.IsGood();
+        bool l = signalLock.IsGood();
+        LOG(VB_CHANNEL, LOG_DEBUG, QString("HasSignalLock: scriptStatus:%1 signalLock:%2").arg(s).arg(l));
+        return s && l;
     }
 
     virtual bool IsAllGood(void) const { return HasSignalLock(); }