{
if (!error)
{
- ePtr<eTable<EventInformationTable> > ptr;
+ ePtr<eTable<EventInformationSection> > ptr;
if (!m_EIT.getCurrent(ptr))
{
int a = 0;
- for (EventInformationTableConstIterator i = ptr->getSections().begin();
+ for (std::vector<EventInformationSection*>::const_iterator i = ptr->getSections().begin();
i != ptr->getSections().end(); ++i)
{
- for (EventConstIterator ev = (*i)->getEvents()->begin(); ev != (*i)->getEvents()->end(); ++ev)
+ const EventInformationSection *eit = *i;
+ for (EventConstIterator ev = eit->getEvents()->begin(); ev != eit->getEvents()->end(); ++ev)
{
ePtr<eServiceEvent> evt = new eServiceEvent();
- evt->parseFrom(*ev);
+ evt->parseFrom(*ev,(eit->getTransportStreamId()<<16)|eit->getOriginalNetworkId());
if (!a)
m_event_now = evt;
else
m_EIT.begin(eApp, eDVBEITSpec(sid), demux);
}
+void eDVBServiceEITHandler::startOther(iDVBDemux *demux, int sid)
+{
+ m_EIT.begin(eApp, eDVBEITSpecOther(sid), demux);
+}
+
RESULT eDVBServiceEITHandler::getEvent(ePtr<eServiceEvent> &event, int nownext)
{
event = nownext ? m_event_next : m_event_now;