Ticket #12495: 12495_debug2.patch

mythtv/libs/libmythtv/diseqc.cpp

@@ -247 +247 @@
  */
 DiSEqCDevTree *DiSEqCDev::FindTree(uint cardid)
 {
+    LOG(VB_CHANNEL, LOG_INFO, LOC +
+        QString("### DiSEqCDev::FindTree() cardid = %1").arg(cardid));
     return m_trees.FindTree(cardid);
 }
 
@@ -276 +278 @@
  */
 DiSEqCDevTree *DiSEqCDevTrees::FindTree(uint cardid)
 {
+    LOG(VB_CHANNEL, LOG_INFO, LOC +
+        QString("### DiSEqCDevTrees::FindTree() cardid = %1").arg(cardid));
+
     QMutexLocker lock(&m_trees_lock);
 
     cardid_to_diseqc_tree_t::iterator it = m_trees.find(cardid);
     if (it != m_trees.end())
+    {
+        LOG(VB_CHANNEL, LOG_INFO, LOC +
+            QString("### DiSEqCDevTrees::FindTree() found existing tree"));
         return *it;
+    }
 
     DiSEqCDevTree *tree = new DiSEqCDevTree;
     tree->Load(cardid);
@@ -330 +339 @@
  */
 bool DiSEqCDevTree::Load(uint cardid)
 {
+    LOG(VB_CHANNEL, LOG_INFO, LOC +
+        QString("### DiSEqCDevTree::Load() cardid = %1").arg(cardid));
+
     // clear children
     delete m_root;
     m_delete.clear();
@@ -349 +361 @@
     }
     else if (!query.next())
     {
+        LOG(VB_CHANNEL, LOG_INFO, LOC +
+            QString("### DiSEqCDevSettings::Load() no results found"));
         return m_root;
     }
 
+    LOG(VB_CHANNEL, LOG_INFO, LOC +
+        QString("### DiSEqCDevSettings::Load() result = %1")
+        .arg(query.value(0).toUInt()));
     if (query.value(0).toUInt())
     {
         m_root = DiSEqCDevDevice::CreateById(
@@ -362 +379 @@
         LOG(VB_GENERAL, LOG_WARNING, LOC +
             QString("No device tree for cardid %1").arg(cardid));
     }
+    LOG(VB_CHANNEL, LOG_INFO, LOC +
+        QString("### DiSEqCDevSettings::Load() m_root = %1")
+        .arg((uint64_t)m_root, 0, 16));
 
     return m_root;
 }
@@ -886 +906 @@
 
 DiSEqCDevDevice *DiSEqCDevDevice::CreateById(DiSEqCDevTree &tree, uint devid)
 {
+    LOG(VB_CHANNEL, LOG_INFO, LOC +
+        QString("### DiSEqCDevDevice::CreateById() devid = %1").arg(devid));
+
     // load settings from DB
     MSqlQuery query(MSqlQuery::InitCon());
     query.prepare(
@@ -907 +930 @@
         return NULL;
     }
 
+    LOG(VB_CHANNEL, LOG_INFO, LOC +
+        QString("### DiSEqCDevDevice::CreateById() results = %1, %2")
+        .arg(query.value(0).toString()).arg(query.value(1).toString()));
+
     dvbdev_t      type = DevTypeFromString(query.value(0).toString());
     QString       desc = query.value(1).toString();
     DiSEqCDevDevice *node = CreateByType(tree, type, devid);
 
+    LOG(VB_CHANNEL, LOG_INFO, LOC +
+        QString("### DiSEqCDevDevice::CreateById() results = %1, %2")
+        .arg((uint64_t)node, 0, 16));
+
     if (node)
     {
         node->SetDescription(desc);

mythtv/libs/libmythtv/recorders/dvbchannel.cpp

@@ -179 +179 @@
 {
     LOG(VB_CHANNEL, LOG_INFO, LOC + "Opening DVB channel");
 
+    if (!m_inputid)
+        InitializeInput();
+
+    if (!m_inputid)
+    {
+        LOG(VB_GENERAL, LOG_ERR, LOC + "Programmer error, no parent.");
+        return false;
+    }
+
     QMutexLocker locker(&hw_lock);
 
     if (fd_frontend >= 0)
@@ -269 +278 @@
         QString("Using DVB card %1, with frontend '%2'.")
             .arg(device).arg(frontend_name));
 
+    LOG(VB_CHANNEL, LOG_INFO, LOC +
+        QString("### tunerType.IsDiSEqCSupported() = %1")
+        .arg(tunerType.IsDiSEqCSupported()));
     // Turn on the power to the LNB
     if (tunerType.IsDiSEqCSupported())
     {
-
+        LOG(VB_CHANNEL, LOG_INFO, LOC +
+            QString("### calling diseqc_dev.FindTree(%1)").arg(m_inputid));
         diseqc_tree = diseqc_dev.FindTree(m_inputid);
+        LOG(VB_CHANNEL, LOG_INFO, LOC +
+            QString("### diseqc_tree = %1").arg((uint64_t)diseqc_tree, 0, 16));
         if (diseqc_tree)
         {
             bool is_SCR = false;