sectionsd: add table ID to event data

record the originating table ID with every event
if not set (e.g. for events read from saved data), it defaults
to 0xff to make sure it is bigger than a real existing table ID

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1381 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: 72149b63a4
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2011-04-09 (Sat, 09 Apr 2011)

lib/sectionsdclient/sectionsdclient.h

@@ -233,6 +233,7 @@ class CEPGData
 	std::vector<std::string>		itemDescriptions;
 	std::vector<std::string>		items;
 	char                            fsk;
+	unsigned char                   table_id;
 	std::string                     contentClassification;
 	std::string                     userClassification;
 
@@ -243,6 +244,7 @@ class CEPGData
 			info1                 = "";
 			info2                 = "";
 			fsk                   =  0;
+			table_id              = 0xff;
 			contentClassification = "";
 			userClassification    = "";
 		};

src/sectionsd/SIevents.cpp

@@ -65,6 +65,7 @@ SIevent::SIevent(const struct eit_event *e)
 
 	running = (int)e->running_status;
 
+	table_id = 0xFF; /* not set */
 	service_id = 0;
 	original_network_id = 0;
 	transport_stream_id = 0;
@@ -77,6 +78,7 @@ SIevent::SIevent(const t_original_network_id _original_network_id, const t_trans
 	transport_stream_id = _transport_stream_id;
 	service_id          = _service_id;
 	eventID		    = _event_id;
+	table_id            = 0xFF; /* not set */
 /*	contentClassification = "";
 	userClassification = "";
 	itemDescription = "";
@@ -105,6 +107,8 @@ SIevent::SIevent(const SIevent &e)
 	ratings=e.ratings;
 	linkage_descs=e.linkage_descs;
 	running=e.running;
+	vps = e.vps;
+	table_id = e.table_id;
 }
 
 int SIevent::saveXML(FILE *file, const char *serviceName) const

src/sectionsd/SIevents.hpp

@@ -353,6 +353,7 @@ public:
 		transport_stream_id = 0;
 		eventID    = 0;
 		vps = 0;
+		table_id = 0xFF; /* 0xFF means "not set" */
 //      dauer=0;
 //      startzeit=0;
 	}
@@ -393,6 +394,7 @@ public:
     SIlinkage_descs linkage_descs;
     SItimes times;
     time_t vps;
+    unsigned char table_id;
     // Der Operator zum sortieren
     bool operator < (const SIevent& e) const {
       return uniqueKey()<e.uniqueKey();

src/sectionsd/SIsections.cpp

@@ -503,6 +503,8 @@ void SIsectionEIT::parse(void)
 		return;
 	}
 
+	unsigned char table_id = header()->table_id;
+
 	actPos = buffer + sizeof(SI_section_EIT_header);
 	bufEnd = buffer + bufferLength;
 
@@ -512,6 +514,7 @@ void SIsectionEIT::parse(void)
 		e.service_id = service_id();
 		e.original_network_id = original_network_id();
 		e.transport_stream_id = transport_stream_id();
+		e.table_id = table_id;
 		descriptors_loop_length = sizeof(struct eit_event) + ((evt->descriptors_loop_length_hi << 8) | evt->descriptors_loop_length_lo);
 		parseDescriptors(actPos, min((unsigned)(bufEnd - actPos), descriptors_loop_length), e);
 		evts.insert(e);

src/sectionsd/sectionsd.cpp

@@ -9179,6 +9179,7 @@ bool sectionsd_getEPGid(const event_id_t epgID, const time_t startzeit, CEPGData
 			epgdata->contentClassification = std::string(evt.contentClassification.data(), evt.contentClassification.length());
 			epgdata->userClassification = std::string(evt.userClassification.data(), evt.userClassification.length());
 			epgdata->fsk = evt.getFSK();
+			epgdata->table_id = evt.table_id;
 
 			epgdata->epg_times.startzeit = t->startzeit;
 			epgdata->epg_times.dauer = t->dauer;
@@ -9236,6 +9237,7 @@ bool sectionsd_getActualEPGServiceKey(const t_channel_id uniqueServiceKey, CEPGD
                 epgdata->contentClassification = std::string(evt.contentClassification.data(), evt.contentClassification.length());
                 epgdata->userClassification = std::string(evt.userClassification.data(), evt.userClassification.length());
                 epgdata->fsk = evt.getFSK();
+		epgdata->table_id = evt.table_id;
 
                 epgdata->epg_times.startzeit = zeit.startzeit;
                 epgdata->epg_times.dauer = zeit.dauer;