Fixes #10712. Add support for HDHR Prime without CableCard.

MythTV · May 28, 2012 · 810b3af · 810b3af
1 parent 00984d7
commit 810b3af
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/mythtv/libs/libmythtv/dtvmultiplex.cpp b/mythtv/libs/libmythtv/dtvmultiplex.cpp
@@ -320,7 +320,7 @@ bool DTVMultiplex::ParseTuningParams(
     if (DTVTunerType::kTunerTypeATSC == type)
         return ParseATSC(_frequency, _modulation);
 
-    LOG(VB_GENERAL, LOG_ERR, LOC + "ParseTuningParams -- Unknown tuner type");
+    LOG(VB_GENERAL, LOG_ERR, LOC + QString("ParseTuningParams -- Unknown tuner type = 0x%1").arg(type, 8, 16, QChar('0')));
 
     return false;
 }

diff --git a/mythtv/libs/libmythtv/hdhrstreamhandler.cpp b/mythtv/libs/libmythtv/hdhrstreamhandler.cpp
@@ -271,7 +271,20 @@ bool HDHRStreamHandler::Open(void)
         _tuner_types.clear();
         if (QString(model).toLower().contains("cablecard"))
         {
-            _tuner_types.push_back(DTVTunerType::kTunerTypeOCUR);
+            hdhomerun_tuner_status_t t_status;
+
+            hdhomerun_device_get_oob_status(_hdhomerun_device, NULL, &t_status);
+            LOG(VB_GENERAL, LOG_DEBUG, LOC + QString("Cable card OOB channel is '%1'").arg(t_status.channel));
+            if (strcmp(t_status.channel, "none") == 0)
+            {
+                LOG(VB_GENERAL, LOG_INFO, LOC + "Cable card is not present");
+                _tuner_types.push_back(DTVTunerType::kTunerTypeATSC);
+            }
+            else
+            {
+                LOG(VB_GENERAL, LOG_INFO, LOC + "Cable card is present");
+                _tuner_types.push_back(DTVTunerType::kTunerTypeOCUR);
+            }
         }
         else if (QString(model).toLower().contains("dvb"))
         {