src/zapit/src/scansdt.cpp dont use in default scan ScanSDT if ScanSDT is disabled

Origin commit data
------------------
Branch: ni/coolstream
Commit: e4f5edf366
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2021-06-28 (Mon, 28 Jun 2021)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
Jacek Jendrzej
2021-06-28 23:06:12 +02:00
committed by vanhofen
parent 2e5f107465
commit ec1ed1b90d

View File

@@ -215,7 +215,8 @@ bool CSdt::Parse(t_transport_stream_id &tsid, t_original_network_id &onid)
sidpmt = pat.getSids(); sidpmt = pat.getSids();
//Update form PAT if SDT is empty //Update form PAT if SDT is empty
if(!sdt_read && !sidpmt.empty() && (pat_tsid == transport_stream_id || (transport_stream_id == 0 && pat_tsid > 1 ))){ bool ScanSDT = CZapit::getInstance()->GetScanSDT();//check for normal scan withot ScanSDT
if(ScanSDT && !sdt_read && !sidpmt.empty() && (pat_tsid == transport_stream_id || (transport_stream_id == 0 && pat_tsid > 1 ))){
bool ret = false; bool ret = false;
for (std::map<int,int>::iterator patit=sidpmt.begin(); patit!=sidpmt.end(); ++patit){ for (std::map<int,int>::iterator patit=sidpmt.begin(); patit!=sidpmt.end(); ++patit){
if(patit->first != 0 && patit->second != 0){ if(patit->first != 0 && patit->second != 0){
@@ -321,7 +322,7 @@ bool CSdt::Parse(t_transport_stream_id &tsid, t_original_network_id &onid)
} }
} }
} }
if(pat_tsid == transport_stream_id){ if(ScanSDT && pat_tsid == transport_stream_id){
for (std::map<int,int>::iterator patit=sidpmt.begin(); patit!=sidpmt.end(); ++patit){ for (std::map<int,int>::iterator patit=sidpmt.begin(); patit!=sidpmt.end(); ++patit){
if(current && current_tp_id != CFEManager::getInstance()->getLiveFE()->getTsidOnid()){ if(current && current_tp_id != CFEManager::getInstance()->getLiveFE()->getTsidOnid()){
failed = true; failed = true;