mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-28 16:01:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix DVB-T2

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 80a9dae785
Author: TangoCash <eric@loxat.de>
Date: 2021-01-17 (Sun, 17 Jan 2021)


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

------------------
This commit was generated by Migit
This commit is contained in:
TangoCash
2021-01-17 18:42:15 +01:00
committed by vanhofen
parent 7aef5f7be1
commit 274474dd4e
2 changed files with 2 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/scan_setup.cpp
View File

@@ -2047,7 +2047,7 @@ void CScanSetup::updateManualSettings()
scansettings.terrestrial_TP_transmit_mode = tI->second.feparams.transmission_mode; scansettings.terrestrial_TP_transmit_mode = tI->second.feparams.transmission_mode;
scansettings.terrestrial_TP_coderate_HP = tI->second.feparams.code_rate_HP; scansettings.terrestrial_TP_coderate_HP = tI->second.feparams.code_rate_HP;
scansettings.terrestrial_TP_coderate_LP = tI->second.feparams.code_rate_LP; scansettings.terrestrial_TP_coderate_LP = tI->second.feparams.code_rate_LP;
scansettings.terrestrial_TP_pli = (tI->second.feparams.plp_id == NO_STREAM_ID_FILTER ? "0" : to_string(tI->second.feparams.plp_id)); scansettings.terrestrial_TP_pli = to_string(tI->second.feparams.plp_id);
scansettings.terrestrialName = CServiceManager::getInstance()->GetSatelliteName(channel->getSatellitePosition()); scansettings.terrestrialName = CServiceManager::getInstance()->GetSatelliteName(channel->getSatellitePosition());
} }
@@ -2172,7 +2172,7 @@ int CTPSelectHandler::exec(CMenuTarget* parent, const std::string &actionkey)
scansettings.terrestrial_TP_transmit_mode = tmpI->second.feparams.transmission_mode; scansettings.terrestrial_TP_transmit_mode = tmpI->second.feparams.transmission_mode;
scansettings.terrestrial_TP_coderate_HP = tmpI->second.feparams.code_rate_HP; scansettings.terrestrial_TP_coderate_HP = tmpI->second.feparams.code_rate_HP;
scansettings.terrestrial_TP_coderate_LP = tmpI->second.feparams.code_rate_LP; scansettings.terrestrial_TP_coderate_LP = tmpI->second.feparams.code_rate_LP;
scansettings.terrestrial_TP_pli = (tmpI->second.feparams.plp_id == NO_STREAM_ID_FILTER ? "0" : to_string(tmpI->second.feparams.plp_id)); scansettings.terrestrial_TP_pli = to_string(tmpI->second.feparams.plp_id);
//scansettings.terrestrialName = CServiceManager::getInstance()->GetSatelliteName(channel->getSatellitePosition()); //scansettings.terrestrialName = CServiceManager::getInstance()->GetSatelliteName(channel->getSatellitePosition());
} }
} }

33
src/zapit/src/transponder.cpp
View File

@@ -162,23 +162,6 @@ void transponder::dumpServiceXml(FILE * fd)
CFrontend::getXMLDeliverySystem(getFEParams()->delsys)); CFrontend::getXMLDeliverySystem(getFEParams()->delsys));
} }
} else if (CFrontend::isTerr(feparams.delsys)) { } else if (CFrontend::isTerr(feparams.delsys)) {
if (getFEParams()->plp_id == NO_STREAM_ID_FILTER)
{
fprintf(fd, "\t\t<TS id=\"%04x\" on=\"%04x\" frq=\"%u\" inv=\"%hu\" bw=\"%u\" hp=\"%hu\" lp=\"%hu\" con=\"%u\" tm=\"%u\" gi=\"%u\" hi=\"%u\" sys=\"%hu\">\n",
transport_stream_id, original_network_id,
getFEParams()->frequency,
getFEParams()->inversion,
getFEParams()->bandwidth,
getFEParams()->code_rate_HP,
getFEParams()->code_rate_LP,
getFEParams()->modulation,
getFEParams()->transmission_mode,
getFEParams()->guard_interval,
getFEParams()->hierarchy,
CFrontend::getXMLDeliverySystem(getFEParams()->delsys));
}
else
{
fprintf(fd, "\t\t<TS id=\"%04x\" on=\"%04x\" frq=\"%u\" inv=\"%hu\" bw=\"%u\" hp=\"%hu\" lp=\"%hu\" con=\"%u\" tm=\"%u\" gi=\"%u\" hi=\"%u\" pli=\"%u\" sys=\"%hu\">\n", fprintf(fd, "\t\t<TS id=\"%04x\" on=\"%04x\" frq=\"%u\" inv=\"%hu\" bw=\"%u\" hp=\"%hu\" lp=\"%hu\" con=\"%u\" tm=\"%u\" gi=\"%u\" hi=\"%u\" pli=\"%u\" sys=\"%hu\">\n",
transport_stream_id, original_network_id, transport_stream_id, original_network_id,
getFEParams()->frequency, getFEParams()->frequency,
@@ -192,7 +175,6 @@ void transponder::dumpServiceXml(FILE * fd)
getFEParams()->hierarchy, getFEParams()->hierarchy,
getFEParams()->plp_id, getFEParams()->plp_id,
CFrontend::getXMLDeliverySystem(getFEParams()->delsys)); CFrontend::getXMLDeliverySystem(getFEParams()->delsys));
}
} }
} }
@@ -233,20 +215,6 @@ void transponder::dump(std::string label)
getFEParams()->delsys); getFEParams()->delsys);
} }
} else if (CFrontend::isTerr(feparams.delsys)) { } else if (CFrontend::isTerr(feparams.delsys)) {
if (getFEParams()->plp_id == NO_STREAM_ID_FILTER)
{
printf("%s tp-id %016" PRIx64 " freq %d bw %d coderate_HP %d coderate_LP %d const %d guard %d sys %d\n", label.c_str(),
transponder_id,
getFEParams()->frequency,
getFEParams()->bandwidth,
getFEParams()->code_rate_HP,
getFEParams()->code_rate_LP,
getFEParams()->modulation,
getFEParams()->guard_interval,
getFEParams()->delsys);
}
else
{
printf("%s tp-id %016" PRIx64 " freq %d bw %d coderate_HP %d coderate_LP %d const %d guard %d pli %u sys %d\n", label.c_str(), printf("%s tp-id %016" PRIx64 " freq %d bw %d coderate_HP %d coderate_LP %d const %d guard %d pli %u sys %d\n", label.c_str(),
transponder_id, transponder_id,
getFEParams()->frequency, getFEParams()->frequency,
@@ -257,7 +225,6 @@ void transponder::dump(std::string label)
getFEParams()->guard_interval, getFEParams()->guard_interval,
getFEParams()->plp_id, getFEParams()->plp_id,
getFEParams()->delsys); getFEParams()->delsys);
}
} }
} }