fix DVB-T2

Duckbox-Developers · Jan 17, 2021 · 1e50579 · 1e50579
1 parent 31a1926
commit 1e50579
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 8 deletions.
diff --git a/src/gui/scan.cpp b/src/gui/scan.cpp
@@ -258,8 +258,6 @@ int CScanTs::exec(CMenuTarget* /*parent*/, const std::string & actionKey)
 			TP.feparams.hierarchy		= (fe_hierarchy_t)scansettings.terrestrial_TP_hierarchy;
 			TP.feparams.delsys		= (delivery_system_t)scansettings.terrestrial_TP_delsys;
 			TP.feparams.plp_id = (unsigned int)atoi(scansettings.terrestrial_TP_pli.c_str());
-			if (TP.feparams.plp_id == 0)
-				TP.feparams.plp_id = NO_STREAM_ID_FILTER;
 		} else if (CFrontend::isCable(delsys)) {
 			TP.feparams.frequency	= atoi(scansettings.cable_TP_freq.c_str());
 			TP.feparams.symbol_rate	= atoi(scansettings.cable_TP_rate.c_str());

diff --git a/src/zapit/src/frontend.cpp b/src/zapit/src/frontend.cpp
@@ -1567,6 +1567,7 @@ int CFrontend::setFrontend(const FrontendParameters *feparams, bool nowait)
 #elif defined DTV_DVBT2_PLP_ID
 			p[cmdseq.num].cmd = DTV_DVBT2_PLP_ID,	p[cmdseq.num].u.data = feparams->plp_id,						cmdseq.num++;
 #endif
+			INFO("[fe%d/%d] streamid (%d/%d/%d)\n", adapter, fenumber, feparams->plp_id, feparams->pls_code, feparams->pls_mode );
 		}
 		break;
 	default:

diff --git a/src/zapit/src/getservices.cpp b/src/zapit/src/getservices.cpp
@@ -441,8 +441,6 @@ void CServiceManager::ParseTransponders(xmlNodePtr node, t_satellite_position sa
 			feparams.guard_interval = (fe_guard_interval_t) xmlGetNumericAttribute(node, "gi", 0);
 			feparams.hierarchy = (fe_hierarchy_t) xmlGetNumericAttribute(node, "hi", 0);
 			feparams.plp_id = (unsigned int) xmlGetNumericAttribute(node, "pli", 0);
-			if (feparams.plp_id == 0)
-				feparams.plp_id = NO_STREAM_ID_FILTER;
 
 			if (feparams.frequency < 1000*1000)
 				feparams.frequency = feparams.frequency*1000;
@@ -794,8 +792,6 @@ void CServiceManager::ParseSatTransponders(delivery_system_t delsys, xmlNodePtr
 							xmlGetNumericAttribute(tps, "hierarchy", 0);
 			feparams.plp_id = (unsigned int)
 							xmlGetNumericAttribute(tps, "plp_id", 0);
-			if (feparams.plp_id == 0)
-				feparams.plp_id = NO_STREAM_ID_FILTER;
 
 			if (feparams.frequency < 1000*1000)
 				feparams.frequency *= 1000;

diff --git a/src/zapit/src/scannit.cpp b/src/zapit/src/scannit.cpp
@@ -459,8 +459,6 @@ bool CNit::ParseTerrestrial2Descriptor(T2DeliverySystemDescriptor * sd, Transpor
 	feparams.delsys			= DVB_T2;
 	feparams.inversion		= INVERSION_AUTO;
 	feparams.plp_id 		= (unsigned int)sd->getPlpId();
-	if (feparams.plp_id == 0)
-		feparams.plp_id = NO_STREAM_ID_FILTER;
 	feparams.code_rate_HP		= CFrontend::getCodeRate(FEC_AUTO, DVB_T2);
 	feparams.code_rate_LP		= CFrontend::getCodeRate(FEC_AUTO, DVB_T2);
 	feparams.modulation		= CFrontend::getConstellation(QAM_AUTO);