mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-09-01 09:51:13 +02:00
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: 9827f03601
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-06-29 (Sat, 29 Jun 2013)
------------------
This commit was generated by Migit
This commit is contained in:
@@ -470,17 +470,21 @@ void CServiceManager::FindTransponder(xmlNodePtr search)
|
|||||||
while (search) {
|
while (search) {
|
||||||
fe_type_t delsys = FE_QPSK;
|
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;
|
delsys = FE_QAM;
|
||||||
|
char * name = xmlGetAttribute(search, "name");
|
||||||
|
satellitePosition = GetSatellitePosition(name);
|
||||||
|
}
|
||||||
else if ((strcmp(xmlGetName(search), "sat"))) {
|
else if ((strcmp(xmlGetName(search), "sat"))) {
|
||||||
search = search->xmlNextNode;
|
search = search->xmlNextNode;
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
#if 0
|
||||||
//t_satellite_position satellitePosition = xmlGetSignedNumericAttribute(search, "position", 10);
|
//t_satellite_position satellitePosition = xmlGetSignedNumericAttribute(search, "position", 10);
|
||||||
char * name = xmlGetAttribute(search, "name");
|
char * name = xmlGetAttribute(search, "name");
|
||||||
t_satellite_position satellitePosition = GetSatellitePosition(name);
|
t_satellite_position satellitePosition = GetSatellitePosition(name);
|
||||||
|
#endif
|
||||||
DBG("going to parse dvb-%c provider %s\n", xmlGetName(search)[0], xmlGetAttribute(search, "name"));
|
DBG("going to parse dvb-%c provider %s\n", xmlGetName(search)[0], xmlGetAttribute(search, "name"));
|
||||||
ParseTransponders(search->xmlChildrenNode, satellitePosition, delsys);
|
ParseTransponders(search->xmlChildrenNode, satellitePosition, delsys);
|
||||||
newfound++;
|
newfound++;
|
||||||
|
Reference in New Issue
Block a user