Ticket #13371: 20190112-hdhr-dvbc.patch

mythtv/libs/libmythtv/cardutil.cpp

@@ -2263 +2263 @@
     return false;
 }
 
+/**
+ * If the device is valid, check if the model does DVB-C.
+ *
+ * \todo This is cut&paste of HDHRdoesDVB, could be merged.
+ */
+
+bool CardUtil::HDHRdoesDVBC(const QString &device)
+{
+    (void) device;
+
+#ifdef USING_HDHOMERUN
+    hdhomerun_device_t  *hdhr;
+    hdhr = hdhomerun_device_create_from_str(device.toLatin1(), nullptr);
+    if (!hdhr)
+        return false;
+
+    const char *model = hdhomerun_device_get_model_str(hdhr);
+    if (model && strstr(model, "dvbc"))
+    {
+        hdhomerun_device_destroy(hdhr);
+        return true;
+    }
+
+    hdhomerun_device_destroy(hdhr);
+
+#endif
+
+    return false;
+}
+
 /**
  * Get a nicely formatted string describing the device
  */

mythtv/libs/libmythtv/cardutil.h

@@ -389 +389 @@
 
     // HDHomeRun info
     static bool         HDHRdoesDVB(const QString &device);
+    static bool         HDHRdoesDVBC(const QString &device);
     static QString      GetHDHRdesc(const QString &device);
 
     // VBox info

mythtv/libs/libmythtv/channelscan/scanwizardconfig.cpp

@@ -167 +167 @@
                          QString::number(ExistingScanImport));
             break;
         case CardUtil::HDHOMERUN:
-            if (CardUtil::HDHRdoesDVB(CardUtil::GetVideoDevice(cardid)))
+            if (CardUtil::HDHRdoesDVBC(CardUtil::GetVideoDevice(cardid)))
+            {
+                addSelection(tr("Full Scan (Tuned)"),
+                             QString::number(NITAddScan_DVBC));
+                addSelection(tr("Full Scan"),
+                             QString::number(FullScan_DVBC), true);
+            }
+            else if (CardUtil::HDHRdoesDVB(CardUtil::GetVideoDevice(cardid)))
             {
                 addSelection(tr("Full Scan"),
                              QString::number(FullScan_DVBT), true);

mythtv/libs/libmythtv/recorders/hdhrstreamhandler.cpp

@@ -329 +329 @@
                 _tuner_types.push_back(DTVTunerType(DTVTunerType::kTunerTypeOCUR));
             }
         }
-        else if (QString(model).toLower().contains("dvb"))
+        else if (QString(model).toLower().endsWith("dvbc"))
+        {
+            _tuner_types.push_back(DTVTunerType(DTVTunerType::kTunerTypeDVBC));
+        }
+        else if (QString(model).toLower().endsWith("dvbt"))
+        {
+            _tuner_types.push_back(DTVTunerType(DTVTunerType::kTunerTypeDVBT));
+        }
+        else if (QString(model).toLower().endsWith("dvbtc"))
         {
             _tuner_types.push_back(DTVTunerType(DTVTunerType::kTunerTypeDVBT));
             _tuner_types.push_back(DTVTunerType(DTVTunerType::kTunerTypeDVBC));