From a74700c34657ef0cb99b4207f069e7881b4d948c Mon Sep 17 00:00:00 2001 From: Klaas de Waal Date: Mon, 16 Mar 2020 23:24:11 +0100 Subject: [PATCH] Add Full Scan option for DVB-C Netherlands Add an entry in the frequency tables for a "Full Scan" option for DVB-C in The Netherlands. There is currently only one entry which is the initial tuning frequency of the Ziggo network. --- mythtv/libs/libmythtv/cardutil.cpp | 2 ++ mythtv/libs/libmythtv/dtvmultiplex.h | 2 +- mythtv/libs/libmythtv/frequencytables.cpp | 11 ++++++++++- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/mythtv/libs/libmythtv/cardutil.cpp b/mythtv/libs/libmythtv/cardutil.cpp index cdc9aea470a..f9098e7d911 100644 --- a/mythtv/libs/libmythtv/cardutil.cpp +++ b/mythtv/libs/libmythtv/cardutil.cpp @@ -2704,7 +2704,9 @@ vector CardUtil::GetLiveTVInputList(void) QString CardUtil::GetDeviceName(dvb_dev_type_t type, const QString &device) { QString devname = QString(device); +#if 0 LOG(VB_RECORD, LOG_DEBUG, LOC + QString("DVB Device (%1)").arg(devname)); +#endif QString tmp = devname; if (DVB_DEV_FRONTEND == type) diff --git a/mythtv/libs/libmythtv/dtvmultiplex.h b/mythtv/libs/libmythtv/dtvmultiplex.h index 608f9bf37a7..0e018d92776 100644 --- a/mythtv/libs/libmythtv/dtvmultiplex.h +++ b/mythtv/libs/libmythtv/dtvmultiplex.h @@ -103,7 +103,7 @@ class MTV_PUBLIC DTVMultiplex DTVHierarchy m_hierarchy; DTVPolarity m_polarity; DTVCodeRate m_fec; ///< Inner Forward Error Correction rate - DTVModulationSystem m_modSys; ///< Modulation system + DTVModulationSystem m_modSys; ///< Modulation system DTVRollOff m_rolloff; // Optional additional info diff --git a/mythtv/libs/libmythtv/frequencytables.cpp b/mythtv/libs/libmythtv/frequencytables.cpp index 55e021fa5cb..26416adfb74 100644 --- a/mythtv/libs/libmythtv/frequencytables.cpp +++ b/mythtv/libs/libmythtv/frequencytables.cpp @@ -194,8 +194,11 @@ QString TransportScanItem::toString() const .arg(m_tuning.m_transMode) .arg(m_tuning.m_guardInterval) .arg(m_tuning.m_hierarchy); + str += QString("\t symbol_rate(%1) fec(%2)\n") + .arg(m_tuning.m_symbolRate) + .arg(m_tuning.m_fec); } - str += QString("\t offset[0..2]: %1 %2 %3") + str += QString("\toffset[0..2]: %1 %2 %3") .arg(m_freqOffsets[0]).arg(m_freqOffsets[1]).arg(m_freqOffsets[2]); return str; } @@ -526,6 +529,12 @@ static void init_freq_tables(freq_table_map_t &fmap) DTVCodeRate::kFECAuto, DTVModulation::kModulationQAMAuto, 6900000, 0, 0); + // DVB-C Netherlands + fmap["dvbc_qam_nl0"] = new FrequencyTable( + 474000000, 474000000, 8000000, "Channel %1", 21, + DTVCodeRate::kFECAuto, DTVModulation::kModulationQAM64, + 6875000, 0, 0); + // DVB-C United Kingdom fmap["dvbc_qam_gb0"] = new FrequencyTable( 12324000, 12324000+1, 10, "Channel %1", 1,