mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-28 07:51:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

eitd: save table id to xml and restore it

Browse Source
This commit is contained in:
[CST] Focus
2012-02-27 13:39:28 +04:00
parent 5abb2285f5
commit 9ed6224258
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/eitd/SIevents.cpp
View File

@@ -265,7 +265,7 @@ int SIevent::saveXML(FILE *file, const char *serviceName) const
int SIevent::saveXML0(FILE *file) const int SIevent::saveXML0(FILE *file) const
{ {
if(fprintf(file, "\t\t<event id=\"%04x\">\n", eventID)<0) if(fprintf(file, "\t\t<event id=\"%04x\" tid=\"%02x\">\n", eventID, table_id)<0)
return 1; return 1;
return 0; return 0;
} }

15
src/eitd/xmlutil.cpp
View File

@@ -254,8 +254,6 @@ void *insertEventsfromFile(void * data)
t_original_network_id onid = 0; t_original_network_id onid = 0;
t_transport_stream_id tsid = 0; t_transport_stream_id tsid = 0;
t_service_id sid = 0; t_service_id sid = 0;
char cclass[20];
char cuser[20];
std::string indexname; std::string indexname;
std::string filename; std::string filename;
std::string epgname; std::string epgname;
@@ -296,6 +294,9 @@ void *insertEventsfromFile(void * data)
while (event) { while (event) {
SIevent e(onid,tsid,sid,xmlGetNumericAttribute(event, "id", 16)); SIevent e(onid,tsid,sid,xmlGetNumericAttribute(event, "id", 16));
uint8_t tid = xmlGetNumericAttribute(event, "tid", 16);
if(tid)
e.table_id = tid;
node = event->xmlChildrenNode; node = event->xmlChildrenNode;
@@ -328,15 +329,13 @@ void *insertEventsfromFile(void * data)
node = node->xmlNextNode; node = node->xmlNextNode;
} }
int count = 0;
while (xmlGetNextOccurence(node, "content") != NULL) { while (xmlGetNextOccurence(node, "content") != NULL) {
cclass[count] = xmlGetNumericAttribute(node, "class", 16); char cl = xmlGetNumericAttribute(node, "class", 16);
cuser[count] = xmlGetNumericAttribute(node, "user", 16); e.contentClassification += cl;
cl = xmlGetNumericAttribute(node, "user", 16);
e.userClassification += cl;
node = node->xmlNextNode; node = node->xmlNextNode;
count++;
} }
e.contentClassification = std::string(cclass, count);
e.userClassification = std::string(cuser, count);
while (xmlGetNextOccurence(node, "component") != NULL) { while (xmlGetNextOccurence(node, "component") != NULL) {
SIcomponent c; SIcomponent c;