From 443ca28c499aa556730395c6fb6efc57a6b8dfd2 Mon Sep 17 00:00:00 2001 From: "[CST] Focus" Date: Sat, 29 Jun 2013 14:47:04 +0400 Subject: [PATCH] src/zapit/src/getservices.cpp: try to fix satellite services load in case service.xml and satellites.xml have different sat names Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/9827f0360110846ea48e2cba0b01fe24e35a8361 Author: [CST] Focus Date: 2013-06-29 (Sat, 29 Jun 2013) ------------------ This commit was generated by Migit --- src/zapit/src/getservices.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/zapit/src/getservices.cpp b/src/zapit/src/getservices.cpp index c1137fa68..30b087724 100644 --- a/src/zapit/src/getservices.cpp +++ b/src/zapit/src/getservices.cpp @@ -470,17 +470,21 @@ void CServiceManager::FindTransponder(xmlNodePtr search) while (search) { fe_type_t delsys = FE_QPSK; - if (!(strcmp(xmlGetName(search), "cable"))) + t_satellite_position satellitePosition = xmlGetSignedNumericAttribute(search, "position", 10); + if (!(strcmp(xmlGetName(search), "cable"))) { delsys = FE_QAM; + char * name = xmlGetAttribute(search, "name"); + satellitePosition = GetSatellitePosition(name); + } else if ((strcmp(xmlGetName(search), "sat"))) { search = search->xmlNextNode; continue; } - +#if 0 //t_satellite_position satellitePosition = xmlGetSignedNumericAttribute(search, "position", 10); char * name = xmlGetAttribute(search, "name"); t_satellite_position satellitePosition = GetSatellitePosition(name); - +#endif DBG("going to parse dvb-%c provider %s\n", xmlGetName(search)[0], xmlGetAttribute(search, "name")); ParseTransponders(search->xmlChildrenNode, satellitePosition, delsys); newfound++;