add ability to select default encoding for dvb texts in many ways.. ( take a look...

[enigma2.git] / lib / dvb / eit.cpp

diff --git a/lib/dvb/eit.cpp b/lib/dvb/eit.cpp
index 2462d333a1d9873ffc7efe148aa03f889c2a846e..cc2c29b2a2fe3bf2ac85a19a26eaa27548f24cce 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<EventInformationTable> > ptr;
+               ePtr<eTable<EventInformationSection> > ptr;

                if (!m_EIT.getCurrent(ptr))
                {
                        int a = 0;
                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)
                        {
                                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