Merge remote-tracking branch 'tuxbox/master'

* needs compile fixes
* needs additional tests, of course :-)
This commit is contained in:
Stefan Seyfried
2016-10-22 11:37:40 +02:00
346 changed files with 13372 additions and 6088 deletions

View File

@@ -306,7 +306,10 @@ bool readEventsFromFile(std::string &epgname, int &ev_count)
onid = xmlGetNumericAttribute(service, "original_network_id", 16);
tsid = xmlGetNumericAttribute(service, "transport_stream_id", 16);
sid = xmlGetNumericAttribute(service, "service_id", 16);
if(!onid || !tsid || !sid){
service = xmlNextNode(service);
continue;
}
event = xmlChildrenNode(service);
while (event) {