diff --git a/mythtv/libs/libmythtv/cardutil.cpp b/mythtv/libs/libmythtv/cardutil.cpp
index 1e32a2bc88..f808f3497a 100644
a
|
b
|
bool CardUtil::HDHRdoesDVB(const QString &device) |
2263 | 2263 | return false; |
2264 | 2264 | } |
2265 | 2265 | |
| 2266 | /** |
| 2267 | * If the device is valid, check if the model does DVB-C. |
| 2268 | * |
| 2269 | * \todo This is cut&paste of HDHRdoesDVB, could be merged. |
| 2270 | */ |
| 2271 | |
| 2272 | bool CardUtil::HDHRdoesDVBC(const QString &device) |
| 2273 | { |
| 2274 | (void) device; |
| 2275 | |
| 2276 | #ifdef USING_HDHOMERUN |
| 2277 | hdhomerun_device_t *hdhr; |
| 2278 | hdhr = hdhomerun_device_create_from_str(device.toLatin1(), nullptr); |
| 2279 | if (!hdhr) |
| 2280 | return false; |
| 2281 | |
| 2282 | const char *model = hdhomerun_device_get_model_str(hdhr); |
| 2283 | if (model && strstr(model, "dvbc")) |
| 2284 | { |
| 2285 | hdhomerun_device_destroy(hdhr); |
| 2286 | return true; |
| 2287 | } |
| 2288 | |
| 2289 | hdhomerun_device_destroy(hdhr); |
| 2290 | |
| 2291 | #endif |
| 2292 | |
| 2293 | return false; |
| 2294 | } |
| 2295 | |
2266 | 2296 | /** |
2267 | 2297 | * Get a nicely formatted string describing the device |
2268 | 2298 | */ |
diff --git a/mythtv/libs/libmythtv/cardutil.h b/mythtv/libs/libmythtv/cardutil.h
index 52a5ba1c99..6bbf5a627f 100644
a
|
b
|
class MTV_PUBLIC CardUtil |
389 | 389 | |
390 | 390 | // HDHomeRun info |
391 | 391 | static bool HDHRdoesDVB(const QString &device); |
| 392 | static bool HDHRdoesDVBC(const QString &device); |
392 | 393 | static QString GetHDHRdesc(const QString &device); |
393 | 394 | |
394 | 395 | // VBox info |
diff --git a/mythtv/libs/libmythtv/channelscan/scanwizardconfig.cpp b/mythtv/libs/libmythtv/channelscan/scanwizardconfig.cpp
index efc4bfc2d6..e53f537283 100644
a
|
b
|
void ScanTypeSetting::SetInput(const QString &cardids_inputname) |
167 | 167 | QString::number(ExistingScanImport)); |
168 | 168 | break; |
169 | 169 | case CardUtil::HDHOMERUN: |
170 | | if (CardUtil::HDHRdoesDVB(CardUtil::GetVideoDevice(cardid))) |
| 170 | if (CardUtil::HDHRdoesDVBC(CardUtil::GetVideoDevice(cardid))) |
| 171 | { |
| 172 | addSelection(tr("Full Scan (Tuned)"), |
| 173 | QString::number(NITAddScan_DVBC)); |
| 174 | addSelection(tr("Full Scan"), |
| 175 | QString::number(FullScan_DVBC), true); |
| 176 | } |
| 177 | else if (CardUtil::HDHRdoesDVB(CardUtil::GetVideoDevice(cardid))) |
171 | 178 | { |
172 | 179 | addSelection(tr("Full Scan"), |
173 | 180 | QString::number(FullScan_DVBT), true); |
diff --git a/mythtv/libs/libmythtv/recorders/hdhrstreamhandler.cpp b/mythtv/libs/libmythtv/recorders/hdhrstreamhandler.cpp
index 9eb32c9c78..40ab716b76 100644
a
|
b
|
bool HDHRStreamHandler::Open(void) |
329 | 329 | _tuner_types.push_back(DTVTunerType(DTVTunerType::kTunerTypeOCUR)); |
330 | 330 | } |
331 | 331 | } |
332 | | else if (QString(model).toLower().contains("dvb")) |
| 332 | else if (QString(model).toLower().endsWith("dvbc")) |
| 333 | { |
| 334 | _tuner_types.push_back(DTVTunerType(DTVTunerType::kTunerTypeDVBC)); |
| 335 | } |
| 336 | else if (QString(model).toLower().endsWith("dvbt")) |
| 337 | { |
| 338 | _tuner_types.push_back(DTVTunerType(DTVTunerType::kTunerTypeDVBT)); |
| 339 | } |
| 340 | else if (QString(model).toLower().endsWith("dvbtc")) |
333 | 341 | { |
334 | 342 | _tuner_types.push_back(DTVTunerType(DTVTunerType::kTunerTypeDVBT)); |
335 | 343 | _tuner_types.push_back(DTVTunerType(DTVTunerType::kTunerTypeDVBC)); |