From 6be1d64932f7007baa7974f72724a97dd6c7304e Mon Sep 17 00:00:00 2001 From: Andreas Monzner Date: Wed, 1 Nov 2006 22:32:30 +0000 Subject: [PATCH 1/1] only accept delivery descriptors when the descriptor type is equal to the type of current scanned transponder (Sat == Sat, Cable == Cable, Terrestrial == Terrestrial) --- lib/dvb/scan.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/lib/dvb/scan.cpp b/lib/dvb/scan.cpp index 00564cdb..f49607c2 100644 --- a/lib/dvb/scan.cpp +++ b/lib/dvb/scan.cpp @@ -356,6 +356,8 @@ void eDVBScan::channelDone() if (m_ready & validNIT) { + int system; + m_ch_current->getSystem(system); SCAN_eDebug("dumping NIT"); if (m_flags & clearToScanOnFirstNIT) { @@ -383,6 +385,8 @@ void eDVBScan::channelDone() { case CABLE_DELIVERY_SYSTEM_DESCRIPTOR: { + if (system != iDVBFrontend::feCable) + break; // when current locked transponder is no cable transponder ignore this descriptor CableDeliverySystemDescriptor &d = (CableDeliverySystemDescriptor&)**desc; ePtr feparm = new eDVBFrontendParameters; eDVBFrontendParametersCable cable; @@ -400,6 +404,8 @@ void eDVBScan::channelDone() } case TERRESTRIAL_DELIVERY_SYSTEM_DESCRIPTOR: { + if (system != iDVBFrontend::feTerrestrial) + break; // when current locked transponder is no terrestrial transponder ignore this descriptor TerrestrialDeliverySystemDescriptor &d = (TerrestrialDeliverySystemDescriptor&)**desc; ePtr feparm = new eDVBFrontendParameters; eDVBFrontendParametersTerrestrial terr; @@ -417,6 +423,9 @@ void eDVBScan::channelDone() } case SATELLITE_DELIVERY_SYSTEM_DESCRIPTOR: { + if (system != iDVBFrontend::feSatellite) + break; // when current locked transponder is no satellite transponder ignore this descriptor + SatelliteDeliverySystemDescriptor &d = (SatelliteDeliverySystemDescriptor&)**desc; if (d.getFrequency() < 10000) break; -- 2.30.2