From 2bfe31821fc817d3bf6f5974c7db1a4e7001e88c Mon Sep 17 00:00:00 2001 From: Stefan Seyfried Date: Sun, 12 May 2013 00:01:34 +0200 Subject: [PATCH] getservices: add code for DVB-T Conflicts: src/zapit/src/getservices.cpp Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/8415c345b82387f36b315eafee431dbaa5cda829 Author: Stefan Seyfried Date: 2013-05-12 (Sun, 12 May 2013) --- src/zapit/src/getservices.cpp | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/zapit/src/getservices.cpp b/src/zapit/src/getservices.cpp index a4b2fed4d..1357c5421 100644 --- a/src/zapit/src/getservices.cpp +++ b/src/zapit/src/getservices.cpp @@ -669,6 +669,11 @@ bool CServiceManager::LoadScanXml(fe_type_t delsys) position = xmlGetSignedNumericAttribute(search, "position", 10); char * name = xmlGetAttribute(search, "name"); InitSatPosition(position, name, false, delsys); + } else if (!(strcmp(xmlGetName(search), "terrestrial"))) { + char * name = xmlGetAttribute(search, "name"); + position = fake_pos++; + position &= 0x0EFF; + InitSatPosition(position, name, false, delsys); } else if(!(strcmp(xmlGetName(search), "cable"))) { char * name = xmlGetAttribute(search, "name"); position = fake_pos++; @@ -725,10 +730,10 @@ bool CServiceManager::LoadServices(bool only_current) INFO("Loading cables..."); LoadScanXml(FE_QAM); } - if (CFEManager::getInstance()->haveTerr()) { - INFO("Loading terrestrial..."); - LoadScanXml(FE_OFDM); - } + if (CFEManager::getInstance()->haveTerr()) { + INFO("Loading terrestrial..."); + LoadScanXml(FE_OFDM); + } parser = parseXmlFile(SERVICES_XML); if (parser != NULL) {