git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add some missing changes
[enigma2.git]
/
lib
/
dvb
/
eit.cpp
diff --git
a/lib/dvb/eit.cpp
b/lib/dvb/eit.cpp
index 2462d333a1d9873ffc7efe148aa03f889c2a846e..fa776b94984c15bc20139b1fef4d96db3aeb785c 100644
(file)
--- a/
lib/dvb/eit.cpp
+++ b/
lib/dvb/eit.cpp
@@
-7,17
+7,18
@@
void eDVBServiceEITHandler::EITready(int error)
{
if (!error)
{
{
if (!error)
{
- ePtr<eTable<EventInformation
Table
> > ptr;
+ ePtr<eTable<EventInformation
Section
> > ptr;
if (!m_EIT.getCurrent(ptr))
{
int a = 0;
if (!m_EIT.getCurrent(ptr))
{
int a = 0;
- for (
EventInformationTableConstI
terator i = ptr->getSections().begin();
+ for (
std::vector<EventInformationSection*>::const_i
terator i = ptr->getSections().begin();
i != ptr->getSections().end(); ++i)
{
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();
{
ePtr<eServiceEvent> evt = new eServiceEvent();
- evt->parseFrom(*ev);
+ evt->parseFrom(*ev
,(eit->getTransportStreamId()<<16)|eit->getOriginalNetworkId()
);
if (!a)
m_event_now = evt;
else
if (!a)
m_event_now = evt;
else
@@
-31,6
+32,15
@@
void eDVBServiceEITHandler::EITready(int error)
m_eit_changed();
}
m_eit_changed();
}
+void eDVBServiceEITHandler::inject(ePtr<eServiceEvent> &event, int nownext)
+{
+ if (nownext)
+ m_event_next = event;
+ else
+ m_event_now = event;
+ m_eit_changed();
+}
+
eDVBServiceEITHandler::eDVBServiceEITHandler()
{
CONNECT(m_EIT.tableReady, eDVBServiceEITHandler::EITready);
eDVBServiceEITHandler::eDVBServiceEITHandler()
{
CONNECT(m_EIT.tableReady, eDVBServiceEITHandler::EITready);
@@
-41,6
+51,11
@@
void eDVBServiceEITHandler::start(iDVBDemux *demux, int sid)
m_EIT.begin(eApp, eDVBEITSpec(sid), demux);
}
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;
RESULT eDVBServiceEITHandler::getEvent(ePtr<eServiceEvent> &event, int nownext)
{
event = nownext ? m_event_next : m_event_now;