more changes for service groups (replacement for zapping alternatives
[enigma2.git] / lib / dvb / epgcache.cpp
index 56a6a61..47da410 100644 (file)
@@ -3,6 +3,10 @@
 
 #undef EPG_DEBUG  
 
+#ifdef EPG_DEBUG
+#include <lib/service/event.h>
+#endif
+
 #include <time.h>
 #include <unistd.h>  // for usleep
 #include <sys/vfs.h> // for statfs
 #include <lib/base/eerror.h>
 #include <lib/dvb/pmt.h>
 #include <lib/dvb/db.h>
-#include <Python.h>
+#include <lib/python/python.h>
 
 int eventData::CacheSize=0;
 descriptorMap eventData::descriptors;
 __u8 eventData::data[4108];
 extern const uint32_t crc32_table[256];
 
+const eServiceReference &handleGroup(const eServiceReference &ref)
+{
+       if (ref.flags & eServiceReference::isGroup)
+       {
+               ePtr<eDVBResourceManager> res;
+               if (!eDVBResourceManager::getInstance(res))
+               {
+                       ePtr<iDVBChannelList> db;
+                       if (!res->getChannelList(db))
+                       {
+                               eBouquet *bouquet=0;
+                               if (!db->getBouquet(ref, bouquet))
+                               {
+                                       std::list<eServiceReference>::iterator it(bouquet->m_services.begin());
+                                       if (it != bouquet->m_services.end())
+                                               return *it;
+                               }
+                       }
+               }
+       }
+       return ref;
+}
+
+
 eventData::eventData(const eit_event_struct* e, int size, int type)
        :ByteSize(size&0xFF), type(type&0xFF)
 {
@@ -204,7 +232,6 @@ void eEPGCache::DVBChannelAdded(eDVBChannel *chan)
 
 void eEPGCache::DVBChannelRunning(iDVBChannel *chan)
 {
-       singleLock s(channel_map_lock);
        channelMapIterator it =
                m_knownChannels.find(chan);
        if ( it == m_knownChannels.end() )
@@ -253,6 +280,20 @@ void eEPGCache::DVBChannelRunning(iDVBChannel *chan)
                                        return;
                                }
 #endif
+#ifdef ENABLE_MHW_EPG
+                               res = demux->createSectionReader( this, data.m_MHWReader );
+                               if ( res )
+                               {
+                                       eDebug("[eEPGCache] couldnt initialize mhw reader!!");
+                                       return;
+                               }
+                               res = demux->createSectionReader( this, data.m_MHWReader2 );
+                               if ( res )
+                               {
+                                       eDebug("[eEPGCache] couldnt initialize mhw reader!!");
+                                       return;
+                               }
+#endif
                                messages.send(Message(Message::startChannel, chan));
                                // -> gotMessage -> changedService
                        }
@@ -282,18 +323,91 @@ void eEPGCache::DVBChannelStateChanged(iDVBChannel *chan)
                                {
                                        eDebug("[eEPGCache] remove channel %p", chan);
                                        messages.send(Message(Message::leaveChannel, chan));
-                                       while(!it->second->can_delete)
-                                               usleep(1000);
-                                       delete it->second;
+                                       pthread_mutex_lock(&it->second->channel_active);
+                                       singleLock s(channel_map_lock);
                                        m_knownChannels.erase(it);
+                                       pthread_mutex_unlock(&it->second->channel_active);
+                                       delete it->second;
+                                       it->second=0;
                                        // -> gotMessage -> abortEPG
                                        break;
                                }
                                default: // ignore all other events
                                        return;
                        }
-                       it->second->prevChannelState = state;
+                       if (it->second)
+                               it->second->prevChannelState = state;
+               }
+       }
+}
+
+void eEPGCache::FixOverlapping(std::pair<eventMap,timeMap> &servicemap, time_t TM, int duration, const timeMap::iterator &tm_it, const uniqueEPGKey &service)
+{
+       timeMap::iterator tmp = tm_it;
+       while ((tmp->first+tmp->second->getDuration()-300) > TM)
+       {
+               if(tmp->first != TM 
+#ifdef ENABLE_PRIVATE_EPG
+                       && tmp->second->type != PRIVATE 
+#endif
+#ifdef ENABLE_MHW
+                       && tmp->second->type != MHW
+#endif
+                       )
+               {
+                       __u16 event_id = tmp->second->getEventID();
+                       servicemap.first.erase(event_id);
+#ifdef EPG_DEBUG
+                       Event evt((uint8_t*)tmp->second->get());
+                       eServiceEvent event;
+                       event.parseFrom(&evt, service.sid<<16|service.onid);
+                       eDebug("(1)erase no more used event %04x %d\n%s %s\n%s",
+                               service.sid, event_id,
+                               event.getBeginTimeString().c_str(),
+                               event.getEventName().c_str(),
+                               event.getExtendedDescription().c_str());
+#endif
+                       delete tmp->second;
+                       if (tmp == servicemap.second.begin())
+                       {
+                               servicemap.second.erase(tmp);
+                               break;
+                       }
+                       else
+                               servicemap.second.erase(tmp--);
                }
+               else
+               {
+                       if (tmp == servicemap.second.begin())
+                               break;
+                       --tmp;
+               }
+       }
+
+       tmp = tm_it;
+       while(tmp->first < (TM+duration-300))
+       {
+               if (tmp->first != TM && tmp->second->type != PRIVATE)
+               {
+                       __u16 event_id = tmp->second->getEventID();
+                       servicemap.first.erase(event_id);
+#ifdef EPG_DEBUG  
+                       Event evt((uint8_t*)tmp->second->get());
+                       eServiceEvent event;
+                       event.parseFrom(&evt, service.sid<<16|service.onid);
+                       eDebug("(2)erase no more used event %04x %d\n%s %s\n%s",
+                               service.sid, event_id,
+                               event.getBeginTimeString().c_str(),
+                               event.getEventName().c_str(),
+                               event.getExtendedDescription().c_str());
+#endif
+                       delete tmp->second;
+                       servicemap.second.erase(tmp++);
+               }
+               else
+                       ++tmp;
+               if (tmp == servicemap.second.end())
+                       break;
        }
 }
 
@@ -317,7 +431,7 @@ void eEPGCache::sectionRead(const __u8 *data, int source, channel_data *channel)
        int duration;
 
        time_t TM = parseDVBtime( eit_event->start_time_1, eit_event->start_time_2,     eit_event->start_time_3, eit_event->start_time_4, eit_event->start_time_5);
-       time_t now = time(0)+eDVBLocalTimeHandler::getInstance()->difference();
+       time_t now = eDVBLocalTimeHandler::getInstance()->nowTime();
 
        if ( TM != 3599 && TM > -1)
                channel->haveData |= source;
@@ -364,24 +478,24 @@ void eEPGCache::sectionRead(const __u8 *data, int source, channel_data *channel)
                        if ( ev_it != servicemap.first.end() )
                        {
                                if ( source > ev_it->second->type )  // update needed ?
-                                       goto next; // when not.. the skip this entry
+                                       goto next; // when not.. then skip this entry
 
                                // search this event in timemap
-                               timeMap::iterator tm_it_tmp = 
+                               timeMap::iterator tm_it_tmp =
                                        servicemap.second.find(ev_it->second->getStartTime());
 
                                if ( tm_it_tmp != servicemap.second.end() )
                                {
-                                       if ( tm_it_tmp->first == TM ) // correct eventData
+                                       if ( tm_it_tmp->first == TM ) // just update eventdata
                                        {
                                                // exempt memory
                                                delete ev_it->second;
-                                               evt = new eventData(eit_event, eit_event_size, source);
-                                               ev_it->second=evt;
-                                               tm_it_tmp->second=evt;
+                                               ev_it->second = tm_it_tmp->second =
+                                                       new eventData(eit_event, eit_event_size, source);
+                                               FixOverlapping(servicemap, TM, duration, tm_it_tmp, service);
                                                goto next;
                                        }
-                                       else
+                                       else  // event has new event begin time
                                        {
                                                tm_erase_count++;
                                                // delete the found record from timemap
@@ -391,45 +505,44 @@ void eEPGCache::sectionRead(const __u8 *data, int source, channel_data *channel)
                                }
                        }
 
-                       // search in timemap, for check of a case if new time has coincided with time of other event 
+                       // search in timemap, for check of a case if new time has coincided with time of other event
                        // or event was is not found in eventmap
                        timeMap::iterator tm_it =
                                servicemap.second.find(TM);
 
                        if ( tm_it != servicemap.second.end() )
                        {
-                               // i think, if event is not found on eventmap, but found on timemap updating nevertheless demands
-#if 0
-                               if ( source > tm_it->second->type && tm_erase_count == 0 ) // update needed ?
-                                       goto next; // when not.. the skip this entry
-#endif
+                               // event with same start time but another event_id...
+                               if ( source > tm_it->second->type &&
+                                       ev_it == servicemap.first.end() )
+                                       goto next; // when not.. then skip this entry
 
                                // search this time in eventmap
-                               eventMap::iterator ev_it_tmp = 
+                               eventMap::iterator ev_it_tmp =
                                        servicemap.first.find(tm_it->second->getEventID());
 
                                if ( ev_it_tmp != servicemap.first.end() )
                                {
-                                       ev_erase_count++;                               
+                                       ev_erase_count++;
                                        // delete the found record from eventmap
                                        servicemap.first.erase(ev_it_tmp);
                                        prevEventIt=servicemap.first.end();
                                }
                        }
-                       
+
                        evt = new eventData(eit_event, eit_event_size, source);
-#if EPG_DEBUG
+#ifdef EPG_DEBUG
                        bool consistencyCheck=true;
 #endif
                        if (ev_erase_count > 0 && tm_erase_count > 0) // 2 different pairs have been removed
                        {
                                // exempt memory
-                               delete ev_it->second; 
+                               delete ev_it->second;
                                delete tm_it->second;
                                ev_it->second=evt;
                                tm_it->second=evt;
                        }
-                       else if (ev_erase_count == 0 && tm_erase_count > 0) 
+                       else if (ev_erase_count == 0 && tm_erase_count > 0)
                        {
                                // exempt memory
                                delete ev_it->second;
@@ -445,34 +558,37 @@ void eEPGCache::sectionRead(const __u8 *data, int source, channel_data *channel)
                        }
                        else // added new eventData
                        {
-#if EPG_DEBUG
+#ifdef EPG_DEBUG
                                consistencyCheck=false;
 #endif
-                               prevEventIt=servicemap.first.insert( prevEventIt, std::pair<const __u16, eventData*>( event_id, evt) );
-                               prevTimeIt=servicemap.second.insert( prevTimeIt, std::pair<const time_t, eventData*>( TM, evt ) );
+                               ev_it=prevEventIt=servicemap.first.insert( prevEventIt, std::pair<const __u16, eventData*>( event_id, evt) );
+                               tm_it=prevTimeIt=servicemap.second.insert( prevTimeIt, std::pair<const time_t, eventData*>( TM, evt ) );
                        }
-#if EPG_DEBUG
+
+                       FixOverlapping(servicemap, TM, duration, tm_it, service);
+
+#ifdef EPG_DEBUG
                        if ( consistencyCheck )
                        {
                                if ( tm_it->second != evt || ev_it->second != evt )
                                        eFatal("tm_it->second != ev_it->second");
                                else if ( tm_it->second->getStartTime() != tm_it->first )
-                                       eFatal("event start_time(%d) non equal timemap key(%d)", 
+                                       eFatal("event start_time(%d) non equal timemap key(%d)",
                                                tm_it->second->getStartTime(), tm_it->first );
                                else if ( tm_it->first != TM )
-                                       eFatal("timemap key(%d) non equal TM(%d)", 
+                                       eFatal("timemap key(%d) non equal TM(%d)",
                                                tm_it->first, TM);
                                else if ( ev_it->second->getEventID() != ev_it->first )
                                        eFatal("event_id (%d) non equal event_map key(%d)",
                                                ev_it->second->getEventID(), ev_it->first);
                                else if ( ev_it->first != event_id )
-                                       eFatal("eventmap key(%d) non equal event_id(%d)", 
+                                       eFatal("eventmap key(%d) non equal event_id(%d)",
                                                ev_it->first, event_id );
                        }
 #endif
                }
 next:
-#if EPG_DEBUG
+#ifdef EPG_DEBUG
                if ( servicemap.first.size() != servicemap.second.size() )
                {
                        FILE *f = fopen("/hdd/event_map.txt", "w+");
@@ -560,7 +676,7 @@ void eEPGCache::cleanLoop()
        {
                eDebug("[EPGC] start cleanloop");
 
-               time_t now = time(0)+eDVBLocalTimeHandler::getInstance()->difference();
+               time_t now = eDVBLocalTimeHandler::getInstance()->nowTime();
 
                for (eventCache::iterator DBIt = eventDB.begin(); DBIt != eventDB.end(); DBIt++)
                {
@@ -674,8 +790,11 @@ void eEPGCache::gotMessage( const Message &msg )
                                        data->m_PrevVersion = -1;
                                        data->m_PrivatePid = msg.pid;
                                        data->m_PrivateService = msg.service;
-                                       updateMap::iterator It = channelLastUpdated.find( channel->getChannelID() );
-                                       int update = ( It != channelLastUpdated.end() ? ( UPDATE_INTERVAL - ( (time(0)+eDVBLocalTimeHandler::getInstance()->difference()-It->second) * 1000 ) ) : ZAP_DELAY );
+                                       int onid = chid.original_network_id.get();
+                                       onid |= 0x80000000;  // we use highest bit as private epg indicator
+                                       chid.original_network_id = onid;
+                                       updateMap::iterator It = channelLastUpdated.find( chid );
+                                       int update = ( It != channelLastUpdated.end() ? ( UPDATE_INTERVAL - ( (eDVBLocalTimeHandler::getInstance()->nowTime()-It->second) * 1000 ) ) : ZAP_DELAY );
                                        if (update < ZAP_DELAY)
                                                update = ZAP_DELAY;
                                        data->startPrivateTimer.start(update, 1);
@@ -739,7 +858,7 @@ void eEPGCache::load()
                        fread( &magic, sizeof(int), 1, f);
                        if (magic != 0x98765432)
                        {
-                               eDebug("epg file has incorrect byte order.. dont read it");
+                               eDebug("[EPGC] epg file has incorrect byte order.. dont read it");
                                fclose(f);
                                return;
                        }
@@ -774,7 +893,7 @@ void eEPGCache::load()
                                        eventDB[key]=std::pair<eventMap,timeMap>(evMap,tmMap);
                                }
                                eventData::load(f);
-                               eDebug("%d events read from /hdd/epg.dat", cnt);
+                               eDebug("[EPGC] %d events read from /hdd/epg.dat", cnt);
 #ifdef ENABLE_PRIVATE_EPG
                                char text2[11];
                                fread( text2, 11, 1, f);
@@ -787,6 +906,7 @@ void eEPGCache::load()
                                                int size=0;
                                                uniqueEPGKey key;
                                                fread( &key, sizeof(uniqueEPGKey), 1, f);
+                                               eventMap &evMap=eventDB[key].first;
                                                fread( &size, sizeof(int), 1, f);
                                                while(size--)
                                                {
@@ -802,6 +922,10 @@ void eEPGCache::load()
                                                                fread( &time2, sizeof(time_t), 1, f);
                                                                fread( &event_id, sizeof(__u16), 1, f);
                                                                content_time_tables[key][content_id][time1]=std::pair<time_t, __u16>(time2, event_id);
+                                                               eventMap::iterator it =
+                                                                       evMap.find(event_id);
+                                                               if (it != evMap.end())
+                                                                       it->second->type = PRIVATE;
                                                        }
                                                }
                                        }
@@ -862,7 +986,7 @@ void eEPGCache::save()
                                ++cnt;
                        }
                }
-               eDebug("%d events written to /hdd/epg.dat", cnt);
+               eDebug("[EPGC] %d events written to /hdd/epg.dat", cnt);
                eventData::save(f);
 #ifdef ENABLE_PRIVATE_EPG
                const char* text3 = "PRIVATE_EPG";
@@ -908,19 +1032,31 @@ void eEPGCache::save()
 
 eEPGCache::channel_data::channel_data(eEPGCache *ml)
        :cache(ml)
-       ,abortTimer(ml), zapTimer(ml), startPrivateTimer(ml)
-       ,state(0), isRunning(0), haveData(0), can_delete(1)
+       ,abortTimer(ml), zapTimer(ml), state(0)
+       ,isRunning(0), haveData(0)
+#ifdef ENABLE_PRIVATE_EPG
+       ,startPrivateTimer(ml)
+#endif
+#ifdef ENABLE_MHW_EPG
+       ,m_MHWTimeoutTimer(ml)
+#endif
 {
+#ifdef ENABLE_MHW_EPG
+       CONNECT(m_MHWTimeoutTimer.timeout, eEPGCache::channel_data::MHWTimeout);
+#endif
        CONNECT(zapTimer.timeout, eEPGCache::channel_data::startEPG);
        CONNECT(abortTimer.timeout, eEPGCache::channel_data::abortNonAvail);
+#ifdef ENABLE_PRIVATE_EPG
        CONNECT(startPrivateTimer.timeout, eEPGCache::channel_data::startPrivateReader);
+#endif
+       pthread_mutex_init(&channel_active, 0);
 }
 
 bool eEPGCache::channel_data::finishEPG()
 {
        if (!isRunning)  // epg ready
        {
-               eDebug("[EPGC] stop caching events(%ld)", time(0)+eDVBLocalTimeHandler::getInstance()->difference());
+               eDebug("[EPGC] stop caching events(%ld)", eDVBLocalTimeHandler::getInstance()->nowTime());
                zapTimer.start(UPDATE_INTERVAL, 1);
                eDebug("[EPGC] next update in %i min", UPDATE_INTERVAL / 60000);
                for (int i=0; i < 3; ++i)
@@ -929,11 +1065,10 @@ bool eEPGCache::channel_data::finishEPG()
                        calcedSections[i].clear();
                }
                singleLock l(cache->cache_lock);
-               cache->channelLastUpdated[channel->getChannelID()] = time(0)+eDVBLocalTimeHandler::getInstance()->difference();
-#ifdef ENABLE_PRIVATE_EPG
-               if (seenPrivateSections.empty())
+               cache->channelLastUpdated[channel->getChannelID()] = eDVBLocalTimeHandler::getInstance()->nowTime();
+#ifdef ENABLE_MHW_EPG
+               cleanup();
 #endif
-               can_delete=1;
                return true;
        }
        return false;
@@ -941,10 +1076,9 @@ bool eEPGCache::channel_data::finishEPG()
 
 void eEPGCache::channel_data::startEPG()
 {
-       eDebug("[EPGC] start caching events(%ld)", eDVBLocalTimeHandler::getInstance()->difference()+time(0));
+       eDebug("[EPGC] start caching events(%ld)", eDVBLocalTimeHandler::getInstance()->nowTime());
        state=0;
        haveData=0;
-       can_delete=0;
        for (int i=0; i < 3; ++i)
        {
                seenSections[i].clear();
@@ -953,6 +1087,29 @@ void eEPGCache::channel_data::startEPG()
 
        eDVBSectionFilterMask mask;
        memset(&mask, 0, sizeof(mask));
+
+#ifdef ENABLE_MHW_EPG
+       mask.pid = 0xD3;
+       mask.data[0] = 0x91;
+       mask.mask[0] = 0xFF;
+       m_MHWReader->connectRead(slot(*this, &eEPGCache::channel_data::readMHWData), m_MHWConn);
+       m_MHWReader->start(mask);
+       isRunning |= MHW;
+       memcpy(&m_MHWFilterMask, &mask, sizeof(eDVBSectionFilterMask));
+
+       mask.pid = 0x231;
+       mask.data[0] = 0xC8;
+       mask.mask[0] = 0xFF;
+       mask.data[1] = 0;
+       mask.mask[1] = 0xFF;
+       m_MHWReader2->connectRead(slot(*this, &eEPGCache::channel_data::readMHWData2), m_MHWConn2);
+       m_MHWReader2->start(mask);
+       isRunning |= MHW;
+       memcpy(&m_MHWFilterMask2, &mask, sizeof(eDVBSectionFilterMask));
+       mask.data[1] = 0;
+       mask.mask[1] = 0;
+#endif
+
        mask.pid = 0x12;
        mask.flags = eDVBSectionFilterMask::rfCRC;
 
@@ -969,7 +1126,6 @@ void eEPGCache::channel_data::startEPG()
        isRunning |= SCHEDULE;
 
        mask.data[0] = 0x60;
-       mask.mask[0] = 0xF0;
        m_ScheduleOtherReader->connectRead(slot(*this, &eEPGCache::channel_data::readData), m_ScheduleOtherConn);
        m_ScheduleOtherReader->start(mask);
        isRunning |= SCHEDULE_OTHER;
@@ -981,27 +1137,38 @@ void eEPGCache::channel_data::abortNonAvail()
 {
        if (!state)
        {
-               if ( !(haveData&eEPGCache::NOWNEXT) && (isRunning&eEPGCache::NOWNEXT) )
+               if ( !(haveData&NOWNEXT) && (isRunning&NOWNEXT) )
                {
                        eDebug("[EPGC] abort non avail nownext reading");
-                       isRunning &= ~eEPGCache::NOWNEXT;
+                       isRunning &= ~NOWNEXT;
                        m_NowNextReader->stop();
                        m_NowNextConn=0;
                }
-               if ( !(haveData&eEPGCache::SCHEDULE) && (isRunning&eEPGCache::SCHEDULE) )
+               if ( !(haveData&SCHEDULE) && (isRunning&SCHEDULE) )
                {
                        eDebug("[EPGC] abort non avail schedule reading");
                        isRunning &= ~SCHEDULE;
                        m_ScheduleReader->stop();
                        m_ScheduleConn=0;
                }
-               if ( !(haveData&eEPGCache::SCHEDULE_OTHER) && (isRunning&eEPGCache::SCHEDULE_OTHER) )
+               if ( !(haveData&SCHEDULE_OTHER) && (isRunning&SCHEDULE_OTHER) )
                {
                        eDebug("[EPGC] abort non avail schedule_other reading");
                        isRunning &= ~SCHEDULE_OTHER;
                        m_ScheduleOtherReader->stop();
                        m_ScheduleOtherConn=0;
                }
+#ifdef ENABLE_MHW_EPG
+               if ( !(haveData&MHW) && (isRunning&MHW) )
+               {
+                       eDebug("[EPGC] abort non avail mhw reading");
+                       isRunning &= ~MHW;
+                       m_MHWReader->stop();
+                       m_MHWConn=0;
+                       m_MHWReader2->stop();
+                       m_MHWConn2=0;
+               }
+#endif
                if ( isRunning )
                        abortTimer.start(90000, true);
                else
@@ -1012,10 +1179,6 @@ void eEPGCache::channel_data::abortNonAvail()
                                seenSections[i].clear();
                                calcedSections[i].clear();
                        }
-#ifdef ENABLE_PRIVATE_EPG
-                       if (seenPrivateSections.empty())
-#endif
-                       can_delete=1;
                }
        }
        ++state;
@@ -1023,9 +1186,10 @@ void eEPGCache::channel_data::abortNonAvail()
 
 void eEPGCache::channel_data::startChannel()
 {
+       pthread_mutex_lock(&channel_active);
        updateMap::iterator It = cache->channelLastUpdated.find( channel->getChannelID() );
 
-       int update = ( It != cache->channelLastUpdated.end() ? ( UPDATE_INTERVAL - ( (time(0)+eDVBLocalTimeHandler::getInstance()->difference()-It->second) * 1000 ) ) : ZAP_DELAY );
+       int update = ( It != cache->channelLastUpdated.end() ? ( UPDATE_INTERVAL - ( (eDVBLocalTimeHandler::getInstance()->nowTime()-It->second) * 1000 ) ) : ZAP_DELAY );
 
        if (update < ZAP_DELAY)
                update = ZAP_DELAY;
@@ -1049,24 +1213,34 @@ void eEPGCache::channel_data::abortEPG()
        if (isRunning)
        {
                eDebug("[EPGC] abort caching events !!");
-               if (isRunning & eEPGCache::SCHEDULE)
+               if (isRunning & SCHEDULE)
                {
-                       isRunning &= ~eEPGCache::SCHEDULE;
+                       isRunning &= ~SCHEDULE;
                        m_ScheduleReader->stop();
                        m_ScheduleConn=0;
                }
-               if (isRunning & eEPGCache::NOWNEXT)
+               if (isRunning & NOWNEXT)
                {
-                       isRunning &= ~eEPGCache::NOWNEXT;
+                       isRunning &= ~NOWNEXT;
                        m_NowNextReader->stop();
                        m_NowNextConn=0;
                }
                if (isRunning & SCHEDULE_OTHER)
                {
-                       isRunning &= ~eEPGCache::SCHEDULE_OTHER;
+                       isRunning &= ~SCHEDULE_OTHER;
                        m_ScheduleOtherReader->stop();
                        m_ScheduleOtherConn=0;
                }
+#ifdef ENABLE_MHW_EPG
+               if (isRunning & MHW)
+               {
+                       isRunning &= ~MHW;
+                       m_MHWReader->stop();
+                       m_MHWConn=0;
+                       m_MHWReader2->stop();
+                       m_MHWConn2=0;
+               }
+#endif
        }
 #ifdef ENABLE_PRIVATE_EPG
        if (m_PrivateReader)
@@ -1074,96 +1248,91 @@ void eEPGCache::channel_data::abortEPG()
        if (m_PrivateConn)
                m_PrivateConn=0;
 #endif
-       can_delete=1;
+       pthread_mutex_unlock(&channel_active);
 }
 
 void eEPGCache::channel_data::readData( const __u8 *data)
 {
-       if (!data)
-               eDebug("get Null pointer from section reader !!");
-       else
+       int source;
+       int map;
+       iDVBSectionReader *reader=NULL;
+       switch(data[0])
+       {
+               case 0x4E ... 0x4F:
+                       reader=m_NowNextReader;
+                       source=NOWNEXT;
+                       map=0;
+                       break;
+               case 0x50 ... 0x5F:
+                       reader=m_ScheduleReader;
+                       source=SCHEDULE;
+                       map=1;
+                       break;
+               case 0x60 ... 0x6F:
+                       reader=m_ScheduleOtherReader;
+                       source=SCHEDULE_OTHER;
+                       map=2;
+                       break;
+               default:
+                       eDebug("[EPGC] unknown table_id !!!");
+                       return;
+       }
+       tidMap &seenSections = this->seenSections[map];
+       tidMap &calcedSections = this->calcedSections[map];
+       if ( state == 1 && calcedSections == seenSections || state > 1 )
        {
-               int source;
-               int map;
-               iDVBSectionReader *reader=NULL;
-               switch(data[0])
+               eDebugNoNewLine("[EPGC] ");
+               switch (source)
                {
-                       case 0x4E ... 0x4F:
-                               reader=m_NowNextReader;
-                               source=eEPGCache::NOWNEXT;
-                               map=0;
+                       case NOWNEXT:
+                               m_NowNextConn=0;
+                               eDebugNoNewLine("nownext");
                                break;
-                       case 0x50 ... 0x5F:
-                               reader=m_ScheduleReader;
-                               source=eEPGCache::SCHEDULE;
-                               map=1;
+                       case SCHEDULE:
+                               m_ScheduleConn=0;
+                               eDebugNoNewLine("schedule");
                                break;
-                       case 0x60 ... 0x6F:
-                               reader=m_ScheduleOtherReader;
-                               source=eEPGCache::SCHEDULE_OTHER;
-                               map=2;
+                       case SCHEDULE_OTHER:
+                               m_ScheduleOtherConn=0;
+                               eDebugNoNewLine("schedule other");
                                break;
-                       default:
-                               eDebug("[EPGC] unknown table_id !!!");
-                               return;
-               }
-               tidMap &seenSections = this->seenSections[map];
-               tidMap &calcedSections = this->calcedSections[map];
-               if ( state == 1 && calcedSections == seenSections || state > 1 )
-               {
-                       eDebugNoNewLine("[EPGC] ");
-                       switch (source)
-                       {
-                               case eEPGCache::NOWNEXT:
-                                       m_NowNextConn=0;
-                                       eDebugNoNewLine("nownext");
-                                       break;
-                               case eEPGCache::SCHEDULE:
-                                       m_ScheduleConn=0;
-                                       eDebugNoNewLine("schedule");
-                                       break;
-                               case eEPGCache::SCHEDULE_OTHER:
-                                       m_ScheduleOtherConn=0;
-                                       eDebugNoNewLine("schedule other");
-                                       break;
-                               default: eDebugNoNewLine("unknown");break;
-                       }
-                       eDebug(" finished(%ld)", time(0)+eDVBLocalTimeHandler::getInstance()->difference());
-                       if ( reader )
-                               reader->stop();
-                       isRunning &= ~source;
-                       if (!isRunning)
-                               finishEPG();
+                       default: eDebugNoNewLine("unknown");break;
                }
-               else
-               {
-                       eit_t *eit = (eit_t*) data;
-                       __u32 sectionNo = data[0] << 24;
-                       sectionNo |= data[3] << 16;
-                       sectionNo |= data[4] << 8;
-                       sectionNo |= eit->section_number;
+               eDebug(" finished(%ld)", eDVBLocalTimeHandler::getInstance()->nowTime());
+               if ( reader )
+                       reader->stop();
+               isRunning &= ~source;
+               if (!isRunning)
+                       finishEPG();
+       }
+       else
+       {
+               eit_t *eit = (eit_t*) data;
+               __u32 sectionNo = data[0] << 24;
+               sectionNo |= data[3] << 16;
+               sectionNo |= data[4] << 8;
+               sectionNo |= eit->section_number;
 
-                       tidMap::iterator it =
-                               seenSections.find(sectionNo);
+               tidMap::iterator it =
+                       seenSections.find(sectionNo);
 
-                       if ( it == seenSections.end() )
+               if ( it == seenSections.end() )
+               {
+                       seenSections.insert(sectionNo);
+                       calcedSections.insert(sectionNo);
+                       __u32 tmpval = sectionNo & 0xFFFFFF00;
+                       __u8 incr = source == NOWNEXT ? 1 : 8;
+                       for ( int i = 0; i <= eit->last_section_number; i+=incr )
                        {
-                               seenSections.insert(sectionNo);
-                               calcedSections.insert(sectionNo);
-                               __u32 tmpval = sectionNo & 0xFFFFFF00;
-                               __u8 incr = source == NOWNEXT ? 1 : 8;
-                               for ( int i = 0; i <= eit->last_section_number; i+=incr )
+                               if ( i == eit->section_number )
                                {
-                                       if ( i == eit->section_number )
-                                       {
-                                               for (int x=i; x <= eit->segment_last_section_number; ++x)
-                                                       calcedSections.insert(tmpval|(x&0xFF));
-                                       }
-                                       else
-                                               calcedSections.insert(tmpval|(i&0xFF));
+                                       for (int x=i; x <= eit->segment_last_section_number; ++x)
+                                               calcedSections.insert(tmpval|(x&0xFF));
                                }
-                               cache->sectionRead(data, source, this);
+                               else
+                                       calcedSections.insert(tmpval|(i&0xFF));
                        }
+                       cache->sectionRead(data, source, this);
                }
        }
 }
@@ -1172,14 +1341,14 @@ RESULT eEPGCache::lookupEventTime(const eServiceReference &service, time_t t, co
 // if t == -1 we search the current event...
 {
        singleLock s(cache_lock);
-       uniqueEPGKey key(service);
+       uniqueEPGKey key(handleGroup(service));
 
        // check if EPG for this service is ready...
        eventCache::iterator It = eventDB.find( key );
        if ( It != eventDB.end() && !It->second.first.empty() ) // entrys cached ?
        {
                if (t==-1)
-                       t = time(0)+eDVBLocalTimeHandler::getInstance()->difference();
+                       t = eDVBLocalTimeHandler::getInstance()->nowTime();
                timeMap::iterator i = direction <= 0 ? It->second.second.lower_bound(t) :  // find > or equal
                        It->second.second.upper_bound(t); // just >
                if ( i != It->second.second.end() )
@@ -1248,7 +1417,7 @@ RESULT eEPGCache::lookupEventTime(const eServiceReference &service, time_t t, eP
 RESULT eEPGCache::lookupEventId(const eServiceReference &service, int event_id, const eventData *&result )
 {
        singleLock s(cache_lock);
-       uniqueEPGKey key( service );
+       uniqueEPGKey key(handleGroup(service));
 
        eventCache::iterator It = eventDB.find( key );
        if ( It != eventDB.end() && !It->second.first.empty() ) // entrys cached?
@@ -1262,7 +1431,7 @@ RESULT eEPGCache::lookupEventId(const eServiceReference &service, int event_id,
                else
                {
                        result = 0;
-                       eDebug("event %04x not found in epgcache", event_id);
+                       eDebug("[EPGC] event %04x not found in epgcache", event_id);
                }
        }
        return -1;
@@ -1305,7 +1474,7 @@ RESULT eEPGCache::lookupEventId(const eServiceReference &service, int event_id,
 
 RESULT eEPGCache::startTimeQuery(const eServiceReference &service, time_t begin, int minutes)
 {
-       eventCache::iterator It = eventDB.find( service );
+       eventCache::iterator It = eventDB.find(handleGroup(service));
        if ( It != eventDB.end() && It->second.second.size() )
        {
                m_timemap_end = minutes != -1 ? It->second.second.upper_bound(begin+minutes*60) : It->second.second.end();
@@ -1329,7 +1498,7 @@ RESULT eEPGCache::startTimeQuery(const eServiceReference &service, time_t begin,
                }
                else
                        m_timemap_cursor = It->second.second.begin();
-               const eServiceReferenceDVB &ref = (const eServiceReferenceDVB&)service;
+               const eServiceReferenceDVB &ref = (const eServiceReferenceDVB&)handleGroup(service);
                currentQueryTsidOnid = (ref.getTransportStreamID().get()<<16) | ref.getOriginalNetworkID().get();
                return 0;
        }
@@ -1377,9 +1546,9 @@ RESULT eEPGCache::getNextTimeEntry(ePtr<eServiceEvent> &result)
        return -1;
 }
 
-void fillTuple(PyObject *tuple, char *argstring, int argcount, PyObject *service, ePtr<eServiceEvent> &ptr, PyObject *nowTime, PyObject *service_name )
+void fillTuple(ePyObject tuple, char *argstring, int argcount, ePyObject service, ePtr<eServiceEvent> &ptr, ePyObject nowTime, ePyObject service_name )
 {
-       PyObject *tmp=NULL;
+       ePyObject tmp;
        int pos=0;
        while(pos < argcount)
        {
@@ -1390,22 +1559,22 @@ void fillTuple(PyObject *tuple, char *argstring, int argcount, PyObject *service
                                tmp = PyLong_FromLong(0);
                                break;
                        case 'I': // Event Id
-                               tmp = ptr ? PyLong_FromLong(ptr->getEventId()) : NULL;
+                               tmp = ptr ? PyLong_FromLong(ptr->getEventId()) : ePyObject();
                                break;
                        case 'B': // Event Begin Time
-                               tmp = ptr ? PyLong_FromLong(ptr->getBeginTime()) : NULL;
+                               tmp = ptr ? PyLong_FromLong(ptr->getBeginTime()) : ePyObject();
                                break;
                        case 'D': // Event Duration
-                               tmp = ptr ? PyLong_FromLong(ptr->getDuration()) : NULL;
+                               tmp = ptr ? PyLong_FromLong(ptr->getDuration()) : ePyObject();
                                break;
                        case 'T': // Event Title
-                               tmp = ptr ? PyString_FromString(ptr->getEventName().c_str()) : NULL;
+                               tmp = ptr ? PyString_FromString(ptr->getEventName().c_str()) : ePyObject();
                                break;
                        case 'S': // Event Short Description
-                               tmp = ptr ? PyString_FromString(ptr->getShortDescription().c_str()) : NULL;
+                               tmp = ptr ? PyString_FromString(ptr->getShortDescription().c_str()) : ePyObject();
                                break;
                        case 'E': // Event Extended Description
-                               tmp = ptr ? PyString_FromString(ptr->getExtendedDescription().c_str()) : NULL;
+                               tmp = ptr ? PyString_FromString(ptr->getExtendedDescription().c_str()) : ePyObject();
                                break;
                        case 'C': // Current Time
                                tmp = nowTime;
@@ -1430,13 +1599,13 @@ void fillTuple(PyObject *tuple, char *argstring, int argcount, PyObject *service
        }
 }
 
-PyObject *handleEvent(ePtr<eServiceEvent> &ptr, PyObject *dest_list, char* argstring, int argcount, PyObject *service, PyObject *nowTime, PyObject *service_name, PyObject *convertFunc, PyObject *convertFuncArgs)
+int handleEvent(ePtr<eServiceEvent> &ptr, ePyObject dest_list, char* argstring, int argcount, ePyObject service, ePyObject nowTime, ePyObject service_name, ePyObject convertFunc, ePyObject convertFuncArgs)
 {
        if (convertFunc)
        {
                fillTuple(convertFuncArgs, argstring, argcount, service, ptr, nowTime, service_name);
-               PyObject *result = PyObject_CallObject(convertFunc, convertFuncArgs);
-               if (result == NULL)
+               ePyObject result = PyObject_CallObject(convertFunc, convertFuncArgs);
+               if (result)
                {
                        if (service_name)
                                Py_DECREF(service_name);
@@ -1444,14 +1613,17 @@ PyObject *handleEvent(ePtr<eServiceEvent> &ptr, PyObject *dest_list, char* argst
                                Py_DECREF(nowTime);
                        Py_DECREF(convertFuncArgs);
                        Py_DECREF(dest_list);
-                       return result;
+                       PyErr_SetString(PyExc_StandardError,
+                               "error in convertFunc execute");
+                       eDebug("error in convertFunc execute");
+                       return -1;
                }
                PyList_Append(dest_list, result);
                Py_DECREF(result);
        }
        else
        {
-               PyObject *tuple = PyTuple_New(argcount);
+               ePyObject tuple = PyTuple_New(argcount);
                fillTuple(tuple, argstring, argcount, service, ptr, nowTime, service_name);
                PyList_Append(dest_list, tuple);
                Py_DECREF(tuple);
@@ -1483,9 +1655,9 @@ PyObject *handleEvent(ePtr<eServiceEvent> &ptr, PyObject *dest_list, char* argst
 //      when type is time then it is the start_time ( 0 for now_time )
 //   the fourth is the end_time .. ( optional .. for query all events in time range)
 
-PyObject *eEPGCache::lookupEvent(PyObject *list, PyObject *convertFunc)
+PyObject *eEPGCache::lookupEvent(ePyObject list, ePyObject convertFunc)
 {
-       PyObject *convertFuncArgs=NULL;
+       ePyObject convertFuncArgs;
        int argcount=0;
        char *argstring=NULL;
        if (!PyList_Check(list))
@@ -1506,7 +1678,7 @@ PyObject *eEPGCache::lookupEvent(PyObject *list, PyObject *convertFunc)
        }
        else 
        {
-               PyObject *argv=PyList_GET_ITEM(list, 0); // borrowed reference!
+               ePyObject argv=PyList_GET_ITEM(list, 0); // borrowed reference!
                if (PyString_Check(argv))
                {
                        argstring = PyString_AS_STRING(argv);
@@ -1529,17 +1701,17 @@ PyObject *eEPGCache::lookupEvent(PyObject *list, PyObject *convertFunc)
                convertFuncArgs = PyTuple_New(argcount);
        }
 
-       PyObject *nowTime = strchr(argstring, 'C') ?
-               PyLong_FromLong(time(0)+eDVBLocalTimeHandler::getInstance()->difference()) :
-               NULL;
+       ePyObject nowTime = strchr(argstring, 'C') ?
+               PyLong_FromLong(eDVBLocalTimeHandler::getInstance()->nowTime()) :
+               ePyObject();
 
        bool must_get_service_name = strchr(argstring, 'N') ? true : false;
 
        // create dest list
-       PyObject *dest_list=PyList_New(0);
+       ePyObject dest_list=PyList_New(0);
        while(listSize > listIt)
        {
-               PyObject *item=PyList_GET_ITEM(list, listIt++); // borrowed reference!
+               ePyObject item=PyList_GET_ITEM(list, listIt++); // borrowed reference!
                if (PyTuple_Check(item))
                {
                        bool service_changed=false;
@@ -1549,10 +1721,10 @@ PyObject *eEPGCache::lookupEvent(PyObject *list, PyObject *convertFunc)
                        int minutes=0;
                        int tupleSize=PyTuple_Size(item);
                        int tupleIt=0;
-                       PyObject *service=NULL;
+                       ePyObject service;
                        while(tupleSize > tupleIt)  // parse query args
                        {
-                               PyObject *entry=PyTuple_GET_ITEM(item, tupleIt); // borrowed reference!
+                               ePyObject entry=PyTuple_GET_ITEM(item, tupleIt); // borrowed reference!
                                switch(tupleIt++)
                                {
                                        case 0:
@@ -1584,7 +1756,7 @@ PyObject *eEPGCache::lookupEvent(PyObject *list, PyObject *convertFunc)
                                                break;
                                }
                        }
-                       eServiceReference ref(PyString_AS_STRING(service));
+                       eServiceReference ref(handleGroup(eServiceReference(PyString_AS_STRING(service))));
                        if (ref.type != eServiceReference::idDVB)
                        {
                                eDebug("service reference for epg query is not valid");
@@ -1608,7 +1780,7 @@ PyObject *eEPGCache::lookupEvent(PyObject *list, PyObject *convertFunc)
                                }
                        }
 
-                       PyObject *service_name=NULL;
+                       ePyObject service_name;
                        if (must_get_service_name)
                        {
                                ePtr<iStaticServiceInformation> sptr;
@@ -1636,9 +1808,11 @@ PyObject *eEPGCache::lookupEvent(PyObject *list, PyObject *convertFunc)
                                        ePtr<eServiceEvent> ptr;
                                        while (!getNextTimeEntry(ptr))
                                        {
-                                               PyObject *ret = handleEvent(ptr, dest_list, argstring, argcount, service, nowTime, service_name, convertFunc, convertFuncArgs);
-                                               if (ret)
-                                                       return ret;
+                                               if (handleEvent(ptr, dest_list, argstring, argcount, service, nowTime, service_name, convertFunc, convertFuncArgs))
+                                               {
+                                                       Unlock();
+                                                       return 0;  // error
+                                               }
                                        }
                                }
                                Unlock();
@@ -1653,9 +1827,8 @@ PyObject *eEPGCache::lookupEvent(PyObject *list, PyObject *convertFunc)
                                        else
                                                lookupEventTime(ref, stime, ptr, type);
                                }
-                               PyObject *ret = handleEvent(ptr, dest_list, argstring, argcount, service, nowTime, service_name, convertFunc, convertFuncArgs);
-                               if (ret)
-                                       return ret;
+                               if (handleEvent(ptr, dest_list, argstring, argcount, service, nowTime, service_name, convertFunc, convertFuncArgs))
+                                       return 0; // error
                        }
                        if (service_changed)
                                Py_DECREF(service);
@@ -1672,9 +1845,9 @@ skip_entry:
        return dest_list;
 }
 
-void fillTuple2(PyObject *tuple, const char *argstring, int argcount, eventData *evData, ePtr<eServiceEvent> &ptr, PyObject *service_name, PyObject *service_reference)
+void fillTuple2(ePyObject tuple, const char *argstring, int argcount, eventData *evData, ePtr<eServiceEvent> &ptr, ePyObject service_name, ePyObject service_reference)
 {
-       PyObject *tmp=NULL;
+       ePyObject tmp;
        int pos=0;
        while(pos < argcount)
        {
@@ -1689,24 +1862,24 @@ void fillTuple2(PyObject *tuple, const char *argstring, int argcount, eventData
                                break;
                        case 'B': // Event Begin Time
                                if (ptr)
-                                       tmp = ptr ? PyLong_FromLong(ptr->getBeginTime()) : NULL;
+                                       tmp = ptr ? PyLong_FromLong(ptr->getBeginTime()) : ePyObject();
                                else
                                        tmp = PyLong_FromLong(evData->getStartTime());
                                break;
                        case 'D': // Event Duration
                                if (ptr)
-                                       tmp = ptr ? PyLong_FromLong(ptr->getDuration()) : NULL;
+                                       tmp = ptr ? PyLong_FromLong(ptr->getDuration()) : ePyObject();
                                else
                                        tmp = PyLong_FromLong(evData->getDuration());
                                break;
                        case 'T': // Event Title
-                               tmp = ptr ? PyString_FromString(ptr->getEventName().c_str()) : NULL;
+                               tmp = ptr ? PyString_FromString(ptr->getEventName().c_str()) : ePyObject();
                                break;
                        case 'S': // Event Short Description
-                               tmp = ptr ? PyString_FromString(ptr->getShortDescription().c_str()) : NULL;
+                               tmp = ptr ? PyString_FromString(ptr->getShortDescription().c_str()) : ePyObject();
                                break;
                        case 'E': // Event Extended Description
-                               tmp = ptr ? PyString_FromString(ptr->getExtendedDescription().c_str()) : NULL;
+                               tmp = ptr ? PyString_FromString(ptr->getExtendedDescription().c_str()) : ePyObject();
                                break;
                        case 'R': // service reference string
                                tmp = service_reference;
@@ -1752,9 +1925,9 @@ void fillTuple2(PyObject *tuple, const char *argstring, int argcount, eventData
 //     0 = case sensitive (CASE_CHECK)
 //     1 = case insensitive (NO_CASECHECK)
 
-PyObject *eEPGCache::search(PyObject *arg)
+PyObject *eEPGCache::search(ePyObject arg)
 {
-       PyObject *ret = 0;
+       ePyObject ret;
        int descridx = -1;
        __u32 descr[512];
        int eventid = -1;
@@ -1770,7 +1943,7 @@ PyObject *eEPGCache::search(PyObject *arg)
                int tuplesize=PyTuple_Size(arg);
                if (tuplesize > 0)
                {
-                       PyObject *obj = PyTuple_GET_ITEM(arg,0);
+                       ePyObject obj = PyTuple_GET_ITEM(arg,0);
                        if (PyString_Check(obj))
                        {
                                argcount = PyString_GET_SIZE(obj);
@@ -1801,7 +1974,7 @@ PyObject *eEPGCache::search(PyObject *arg)
                        querytype = PyLong_AsLong(PyTuple_GET_ITEM(arg, 2));
                        if (tuplesize > 4 && querytype == 0)
                        {
-                               PyObject *obj = PyTuple_GET_ITEM(arg, 3);
+                               ePyObject obj = PyTuple_GET_ITEM(arg, 3);
                                if (PyString_Check(obj))
                                {
                                        refstr = PyString_AS_STRING(obj);
@@ -1858,7 +2031,7 @@ PyObject *eEPGCache::search(PyObject *arg)
                        }
                        else if (tuplesize > 4 && (querytype == 1 || querytype == 2) )
                        {
-                               PyObject *obj = PyTuple_GET_ITEM(arg, 3);
+                               ePyObject obj = PyTuple_GET_ITEM(arg, 3);
                                if (PyString_Check(obj))
                                {
                                        int casetype = PyLong_AsLong(PyTuple_GET_ITEM(arg, 4));
@@ -1961,7 +2134,7 @@ PyObject *eEPGCache::search(PyObject *arg)
        if (descridx > -1)
        {
                int maxcount=maxmatches;
-               eServiceReferenceDVB ref(refstr?refstr:"");
+               eServiceReferenceDVB ref(refstr?(const eServiceReferenceDVB&)handleGroup(eServiceReference(refstr)):eServiceReferenceDVB(""));
                // ref is only valid in SIMILAR_BROADCASTING_SEARCH
                // in this case we start searching with the base service
                bool first = ref.valid() ? true : false;
@@ -1975,13 +2148,14 @@ PyObject *eEPGCache::search(PyObject *arg)
                                ++cit;
                                continue;
                        }
-                       PyObject *service_name=0;
-                       PyObject *service_reference=0;
+                       ePyObject service_name;
+                       ePyObject service_reference;
                        timeMap &evmap = cit->second.second;
                        // check all events
                        for (timeMap::iterator evit(evmap.begin()); evit != evmap.end() && maxcount; ++evit)
                        {
-                               if (evit->second->getEventID() == eventid)
+                               int evid = evit->second->getEventID();
+                               if ( evid == eventid)
                                        continue;
                                __u8 *data = evit->second->EITdata;
                                int tmp = evit->second->ByteSize-12;
@@ -2010,7 +2184,7 @@ PyObject *eEPGCache::search(PyObject *arg)
                                                ePtr<eServiceEvent> ptr;
                                                if (needServiceEvent)
                                                {
-                                                       lookupEventId(ref, evit->first, ptr);
+                                                       lookupEventId(ref, evid, ptr);
                                                        if (!ptr)
                                                                eDebug("event not found !!!!!!!!!!!");
                                                }
@@ -2041,7 +2215,7 @@ PyObject *eEPGCache::search(PyObject *arg)
                                                if (!ret)
                                                        ret = PyList_New(0);
                                        // create tuple
-                                               PyObject *tuple = PyTuple_New(argcount);
+                                               ePyObject tuple = PyTuple_New(argcount);
                                        // fill tuple
                                                fillTuple2(tuple, argstring, argcount, evit->second, ptr, service_name, service_reference);
                                                PyList_Append(ret, tuple);
@@ -2227,13 +2401,21 @@ void eEPGCache::privateSectionRead(const uniqueEPGKey &current_service, const __
                        int sid = data[ptr++] << 8;
                        sid |= data[ptr++];
 
-// WORKAROUND for wrong transmitted epg data
-                       if ( onid == 0x85 && tsid == 0x11 && sid == 0xd3 )  // premiere sends wrong tsid here
-                               tsid = 0x1;
-                       else if ( onid == 0x85 && tsid == 0x3 && sid == 0xf5 ) // premiere sends wrong sid here
-                               sid = 0xdc;
+// WORKAROUND for wrong transmitted epg data (01.08.2006)
+                       if ( onid == 0x85 )
+                       {
+                               switch( (tsid << 16) | sid )
+                               {
+                                       case 0x01030b: sid = 0x1b; tsid = 4; break;  // Premiere Win
+                                       case 0x0300f0: sid = 0xe0; tsid = 2; break;
+                                       case 0x0300f1: sid = 0xe1; tsid = 2; break;
+                                       case 0x0300f5: sid = 0xdc; break;
+                                       case 0x0400d2: sid = 0xe2; tsid = 0x11; break;
+                                       case 0x1100d3: sid = 0xe3; break;
+                               }
+                       }
 ////////////////////////////////////////////
-                               
+
                        uniqueEPGKey service( sid, onid, tsid );
                        descr_len -= 6;
                        while( descr_len > 0 )
@@ -2309,7 +2491,7 @@ void eEPGCache::privateSectionRead(const uniqueEPGKey &current_service, const __
                event[0] = (event_id & 0xFF00) >> 8;
                event[1] = (event_id & 0xFF);
                time_event_map[it->first.tm]=std::pair<time_t, __u16>(stime, event_id);
-               eventData *d = new eventData( ev_struct, bptr, eEPGCache::SCHEDULE );
+               eventData *d = new eventData( ev_struct, bptr, PRIVATE );
                evMap[event_id] = d;
                tmMap[stime] = d;
        }
@@ -2323,7 +2505,7 @@ void eEPGCache::channel_data::startPrivateReader()
        mask.flags = eDVBSectionFilterMask::rfCRC;
        mask.data[0] = 0xA0;
        mask.mask[0] = 0xFF;
-       eDebug("start privatefilter for pid %04x and version %d", m_PrivatePid, m_PrevVersion);
+       eDebug("[EPGC] start privatefilter for pid %04x and version %d", m_PrivatePid, m_PrevVersion);
        if (m_PrevVersion != -1)
        {
                mask.data[3] = m_PrevVersion << 1;
@@ -2331,45 +2513,749 @@ void eEPGCache::channel_data::startPrivateReader()
                mask.mode[3] = 0x3E;
        }
        seenPrivateSections.clear();
-       m_PrivateReader->connectRead(slot(*this, &eEPGCache::channel_data::readPrivateData), m_PrivateConn);
+       if (!m_PrivateConn)
+               m_PrivateReader->connectRead(slot(*this, &eEPGCache::channel_data::readPrivateData), m_PrivateConn);
        m_PrivateReader->start(mask);
 }
 
 void eEPGCache::channel_data::readPrivateData( const __u8 *data)
 {
-       if (!data)
-               eDebug("get Null pointer from section reader !!");
+       if ( seenPrivateSections.find( data[6] ) == seenPrivateSections.end() )
+       {
+               cache->privateSectionRead(m_PrivateService, data);
+               seenPrivateSections.insert(data[6]);
+       }
+       if ( seenPrivateSections.size() == (unsigned int)(data[7] + 1) )
+       {
+               eDebug("[EPGC] private finished");
+               eDVBChannelID chid = channel->getChannelID();
+               int tmp = chid.original_network_id.get();
+               tmp |= 0x80000000; // we use highest bit as private epg indicator
+               chid.original_network_id = tmp;
+               cache->channelLastUpdated[chid] = eDVBLocalTimeHandler::getInstance()->nowTime();
+               m_PrevVersion = (data[5] & 0x3E) >> 1;
+               startPrivateReader();
+       }
+}
+
+#endif // ENABLE_PRIVATE_EPG
+
+#ifdef ENABLE_MHW_EPG
+void eEPGCache::channel_data::cleanup()
+{
+       m_channels.clear();
+       m_themes.clear();
+       m_titles.clear();
+       m_program_ids.clear();
+}
+
+__u8 *eEPGCache::channel_data::delimitName( __u8 *in, __u8 *out, int len_in )
+{
+       // Names in mhw structs are not strings as they are not '\0' terminated.
+       // This function converts the mhw name into a string.
+       // Constraint: "length of out" = "length of in" + 1.
+       int i;
+       for ( i=0; i < len_in; i++ )
+               out[i] = in[i];
+
+       i = len_in - 1;
+       while ( ( i >=0 ) && ( out[i] == 0x20 ) )
+               i--;
+
+       out[i+1] = 0;
+       return out;
+}
+
+void eEPGCache::channel_data::timeMHW2DVB( u_char hours, u_char minutes, u_char *return_time)
+// For time of day
+{
+       return_time[0] = toBCD( hours );
+       return_time[1] = toBCD( minutes );
+       return_time[2] = 0;
+}
+
+void eEPGCache::channel_data::timeMHW2DVB( int minutes, u_char *return_time)
+{
+       timeMHW2DVB( int(minutes/60), minutes%60, return_time );
+}
+
+void eEPGCache::channel_data::timeMHW2DVB( u_char day, u_char hours, u_char minutes, u_char *return_time)
+// For date plus time of day
+{
+       // Remove offset in mhw time.
+       __u8 local_hours = hours;
+       if ( hours >= 16 )
+               local_hours -= 4;
+       else if ( hours >= 8 )
+               local_hours -= 2;
+
+       // As far as we know all mhw time data is sent in central Europe time zone.
+       // So, temporarily set timezone to western europe
+       time_t dt = eDVBLocalTimeHandler::getInstance()->nowTime();
+
+       char *old_tz = getenv( "TZ" );
+       putenv("TZ=CET-1CEST,M3.5.0/2,M10.5.0/3");
+       tzset();
+
+       tm *localnow = localtime( &dt );
+
+       if (day == 7)
+               day = 0;
+       if ( day + 1 < localnow->tm_wday )              // day + 1 to prevent old events to show for next week.
+               day += 7;
+       if (local_hours <= 5)
+               day++;
+
+       dt += 3600*24*(day - localnow->tm_wday);        // Shift dt to the recording date (local time zone).
+       dt += 3600*(local_hours - localnow->tm_hour);  // Shift dt to the recording hour.
+
+       tm *recdate = gmtime( &dt );   // This will also take care of DST.
+
+       if ( old_tz == NULL )
+               unsetenv( "TZ" );
        else
+               putenv( old_tz );
+       tzset();
+
+       // Calculate MJD according to annex in ETSI EN 300 468
+       int l=0;
+       if ( recdate->tm_mon <= 1 )     // Jan or Feb
+               l=1;
+       int mjd = 14956 + recdate->tm_mday + int( (recdate->tm_year - l) * 365.25) +
+               int( (recdate->tm_mon + 2 + l * 12) * 30.6001);
+
+       return_time[0] = (mjd & 0xFF00)>>8;
+       return_time[1] = mjd & 0xFF;
+
+       timeMHW2DVB( recdate->tm_hour, minutes, return_time+2 );
+}
+
+void eEPGCache::channel_data::storeTitle(std::map<__u32, mhw_title_t>::iterator itTitle, std::string sumText, const __u8 *data)
+// data is borrowed from calling proc to save memory space.
+{
+       __u8 name[34];
+       // For each title a separate EIT packet will be sent to eEPGCache::sectionRead()
+       bool isMHW2 = itTitle->second.mhw2_mjd_hi || itTitle->second.mhw2_mjd_lo ||
+               itTitle->second.mhw2_duration_hi || itTitle->second.mhw2_duration_lo;
+
+       eit_t *packet = (eit_t *) data;
+       packet->table_id = 0x50;
+       packet->section_syntax_indicator = 1;
+       packet->service_id_hi = m_channels[ itTitle->second.channel_id - 1 ].channel_id_hi;
+       packet->service_id_lo = m_channels[ itTitle->second.channel_id - 1 ].channel_id_lo;
+       packet->version_number = 0;     // eEPGCache::sectionRead() will dig this for the moment
+       packet->current_next_indicator = 0;
+       packet->section_number = 0;     // eEPGCache::sectionRead() will dig this for the moment
+       packet->last_section_number = 0;        // eEPGCache::sectionRead() will dig this for the moment
+       packet->transport_stream_id_hi = m_channels[ itTitle->second.channel_id - 1 ].transport_stream_id_hi;
+       packet->transport_stream_id_lo = m_channels[ itTitle->second.channel_id - 1 ].transport_stream_id_lo;
+       packet->original_network_id_hi = m_channels[ itTitle->second.channel_id - 1 ].network_id_hi;
+       packet->original_network_id_lo = m_channels[ itTitle->second.channel_id - 1 ].network_id_lo;
+       packet->segment_last_section_number = 0; // eEPGCache::sectionRead() will dig this for the moment
+       packet->segment_last_table_id = 0x50;
+
+       __u8 *title = isMHW2 ? ((__u8*)(itTitle->second.title))-4 : (__u8*)itTitle->second.title;
+       std::string prog_title = (char *) delimitName( title, name, isMHW2 ? 33 : 23 );
+       int prog_title_length = prog_title.length();
+
+       int packet_length = EIT_SIZE + EIT_LOOP_SIZE + EIT_SHORT_EVENT_DESCRIPTOR_SIZE +
+               prog_title_length + 1;
+
+       eit_event_t *event_data = (eit_event_t *) (data + EIT_SIZE);
+       event_data->event_id_hi = (( itTitle->first ) >> 8 ) & 0xFF;
+       event_data->event_id_lo = ( itTitle->first ) & 0xFF;
+
+       if (isMHW2)
        {
-               if ( seenPrivateSections.find( data[6] ) == seenPrivateSections.end() )
+               u_char *data = (u_char*) event_data;
+               data[2] = itTitle->second.mhw2_mjd_hi;
+               data[3] = itTitle->second.mhw2_mjd_lo;
+               data[4] = itTitle->second.mhw2_hours;
+               data[5] = itTitle->second.mhw2_minutes;
+               data[6] = itTitle->second.mhw2_seconds;
+               timeMHW2DVB( HILO(itTitle->second.mhw2_duration), data+7 );
+       }
+       else
+       {
+               timeMHW2DVB( itTitle->second.dh.day, itTitle->second.dh.hours, itTitle->second.ms.minutes,
+               (u_char *) event_data + 2 );
+               timeMHW2DVB( HILO(itTitle->second.duration), (u_char *) event_data+7 );
+       }
+
+       event_data->running_status = 0;
+       event_data->free_CA_mode = 0;
+       int descr_ll = EIT_SHORT_EVENT_DESCRIPTOR_SIZE + 1 + prog_title_length;
+
+       eit_short_event_descriptor_struct *short_event_descriptor =
+               (eit_short_event_descriptor_struct *) ( (u_char *) event_data + EIT_LOOP_SIZE);
+       short_event_descriptor->descriptor_tag = EIT_SHORT_EVENT_DESCRIPTOR;
+       short_event_descriptor->descriptor_length = EIT_SHORT_EVENT_DESCRIPTOR_SIZE +
+               prog_title_length - 1;
+       short_event_descriptor->language_code_1 = 'e';
+       short_event_descriptor->language_code_2 = 'n';
+       short_event_descriptor->language_code_3 = 'g';
+       short_event_descriptor->event_name_length = prog_title_length;
+       u_char *event_name = (u_char *) short_event_descriptor + EIT_SHORT_EVENT_DESCRIPTOR_SIZE;
+       memcpy(event_name, prog_title.c_str(), prog_title_length);
+
+       // Set text length
+       event_name[prog_title_length] = 0;
+
+       if ( sumText.length() > 0 )
+       // There is summary info
+       {
+               unsigned int sum_length = sumText.length();
+               if ( sum_length + short_event_descriptor->descriptor_length <= 0xff )
+               // Store summary in short event descriptor
                {
-#ifdef NEED_DEMUX_WORKAROUND
-                       int version = data[5];
-                       version = ((version & 0x3E) >> 1);
-                       can_delete = 0;
-                       if ( m_PrevVersion != version )
+                       // Increase all relevant lengths
+                       event_name[prog_title_length] = sum_length;
+                       short_event_descriptor->descriptor_length += sum_length;
+                       packet_length += sum_length;
+                       descr_ll += sum_length;
+                       sumText.copy( (char *) event_name+prog_title_length+1, sum_length );
+               }
+               else
+               // Store summary in extended event descriptors
+               {
+                       int remaining_sum_length = sumText.length();
+                       int nbr_descr = int(remaining_sum_length/247) + 1;
+                       for ( int i=0; i < nbr_descr; i++)
+                       // Loop once per extended event descriptor
                        {
-                               cache->privateSectionRead(m_PrivateService, data);
-                               seenPrivateSections.insert(data[6]);
+                               eit_extended_descriptor_struct *ext_event_descriptor = (eit_extended_descriptor_struct *) (data + packet_length);
+                               sum_length = remaining_sum_length > 247 ? 247 : remaining_sum_length;
+                               remaining_sum_length -= sum_length;
+                               packet_length += 8 + sum_length;
+                               descr_ll += 8 + sum_length;
+
+                               ext_event_descriptor->descriptor_tag = EIT_EXTENDED_EVENT_DESCRIPOR;
+                               ext_event_descriptor->descriptor_length = sum_length + 6;
+                               ext_event_descriptor->descriptor_number = i;
+                               ext_event_descriptor->last_descriptor_number = nbr_descr - 1;
+                               ext_event_descriptor->iso_639_2_language_code_1 = 'e';
+                               ext_event_descriptor->iso_639_2_language_code_2 = 'n';
+                               ext_event_descriptor->iso_639_2_language_code_3 = 'g';
+                               u_char *the_text = (u_char *) ext_event_descriptor + 8;
+                               the_text[-2] = 0;
+                               the_text[-1] = sum_length;
+                               sumText.copy( (char *) the_text, sum_length, sumText.length() - sum_length - remaining_sum_length );
+                       }
+               }
+       }
+
+       if (!isMHW2)
+       {
+               // Add content descriptor
+               u_char *descriptor = (u_char *) data + packet_length;
+               packet_length += 4;
+               descr_ll += 4;
+
+               int content_id = 0;
+               std::string content_descr = (char *) delimitName( m_themes[itTitle->second.theme_id].name, name, 15 );
+               if ( content_descr.find( "FILM" ) != std::string::npos )
+                       content_id = 0x10;
+               else if ( content_descr.find( "SPORT" ) != std::string::npos )
+                       content_id = 0x40;
+
+               descriptor[0] = 0x54;
+               descriptor[1] = 2;
+               descriptor[2] = content_id;
+               descriptor[3] = 0;
+       }
+
+       event_data->descriptors_loop_length_hi = (descr_ll & 0xf00)>>8;
+       event_data->descriptors_loop_length_lo = (descr_ll & 0xff);
+
+       packet->section_length_hi =  ((packet_length - 3)&0xf00)>>8;
+       packet->section_length_lo =  (packet_length - 3)&0xff;
+
+       // Feed the data to eEPGCache::sectionRead()
+       cache->sectionRead( data, MHW, this );
+}
+
+void eEPGCache::channel_data::startTimeout(int msec)
+{
+       m_MHWTimeoutTimer.start(msec,true);
+       m_MHWTimeoutet=false;
+}
+
+void eEPGCache::channel_data::startMHWReader(__u16 pid, __u8 tid)
+{
+       m_MHWFilterMask.pid = pid;
+       m_MHWFilterMask.data[0] = tid;
+       m_MHWReader->start(m_MHWFilterMask);
+//     eDebug("start 0x%02x 0x%02x", pid, tid);
+}
+
+void eEPGCache::channel_data::startMHWReader2(__u16 pid, __u8 tid, int ext)
+{
+       m_MHWFilterMask2.pid = pid;
+       m_MHWFilterMask2.data[0] = tid;
+       if (ext != -1)
+       {
+               m_MHWFilterMask2.data[1] = ext;
+               m_MHWFilterMask2.mask[1] = 0xFF;
+//             eDebug("start 0x%03x 0x%02x 0x%02x", pid, tid, ext);
+       }
+       else
+       {
+               m_MHWFilterMask2.data[1] = 0;
+               m_MHWFilterMask2.mask[1] = 0;
+//             eDebug("start 0x%02x 0x%02x", pid, tid);
+       }
+       m_MHWReader2->start(m_MHWFilterMask2);
+}
+
+void eEPGCache::channel_data::readMHWData(const __u8 *data)
+{
+       if ( m_MHWReader2 )
+               m_MHWReader2->stop();
+
+       if ( state > 1 || // aborted
+               // have si data.. so we dont read mhw data
+               (haveData & (SCHEDULE|SCHEDULE_OTHER)) )
+       {
+               eDebug("[EPGC] mhw aborted %d", state);
+       }
+       else if (m_MHWFilterMask.pid == 0xD3 && m_MHWFilterMask.data[0] == 0x91)
+       // Channels table
+       {
+               int len = ((data[1]&0xf)<<8) + data[2] - 1;
+               int record_size = sizeof( mhw_channel_name_t );
+               int nbr_records = int (len/record_size);
+
+               for ( int i = 0; i < nbr_records; i++ )
+               {
+                       mhw_channel_name_t *channel = (mhw_channel_name_t*) &data[4 + i*record_size];
+                       m_channels.push_back( *channel );
+               }
+               haveData |= MHW;
+
+               eDebug("[EPGC] mhw %d channels found", m_channels.size());
+
+               // Channels table has been read, start reading the themes table.
+               startMHWReader(0xD3, 0x92);
+               return;
+       }
+       else if (m_MHWFilterMask.pid == 0xD3 && m_MHWFilterMask.data[0] == 0x92)
+       // Themes table
+       {
+               int len = ((data[1]&0xf)<<8) + data[2] - 16;
+               int record_size = sizeof( mhw_theme_name_t );
+               int nbr_records = int (len/record_size);
+               int idx_ptr = 0;
+               __u8 next_idx = (__u8) *(data + 3 + idx_ptr);
+               __u8 idx = 0;
+               __u8 sub_idx = 0;
+               for ( int i = 0; i < nbr_records; i++ )
+               {
+                       mhw_theme_name_t *theme = (mhw_theme_name_t*) &data[19 + i*record_size];
+                       if ( i >= next_idx )
+                       {
+                               idx = (idx_ptr<<4);
+                               idx_ptr++;
+                               next_idx = (__u8) *(data + 3 + idx_ptr);
+                               sub_idx = 0;
                        }
                        else
-                               eDebug("ignore");
-#else
-                       can_delete = 0;
-                       cache->privateSectionRead(m_PrivateService, data);
-                       seenPrivateSections.insert(data[6]);
-#endif
+                               sub_idx++;
+
+                       m_themes[idx+sub_idx] = *theme;
+               }
+               eDebug("[EPGC] mhw %d themes found", m_themes.size());
+               // Themes table has been read, start reading the titles table.
+               startMHWReader(0xD2, 0x90);
+               startTimeout(4000);
+               return;
+       }
+       else if (m_MHWFilterMask.pid == 0xD2 && m_MHWFilterMask.data[0] == 0x90)
+       // Titles table
+       {
+               mhw_title_t *title = (mhw_title_t*) data;
+
+               if ( title->channel_id == 0xFF )        // Separator
+                       return; // Continue reading of the current table.
+               else
+               {
+                       // Create unique key per title
+                       __u32 title_id = ((title->channel_id)<<16)|((title->dh.day)<<13)|((title->dh.hours)<<8)|
+                               (title->ms.minutes);
+                       __u32 program_id = ((title->program_id_hi)<<24)|((title->program_id_mh)<<16)|
+                               ((title->program_id_ml)<<8)|(title->program_id_lo);
+
+                       if ( m_titles.find( title_id ) == m_titles.end() )
+                       {
+                               startTimeout(4000);
+                               title->mhw2_mjd_hi = 0;
+                               title->mhw2_mjd_lo = 0;
+                               title->mhw2_duration_hi = 0;
+                               title->mhw2_duration_lo = 0;
+                               m_titles[ title_id ] = *title;
+                               if ( (title->ms.summary_available) && (m_program_ids.find(program_id) == m_program_ids.end()) )
+                                       // program_ids will be used to gather summaries.
+                                       m_program_ids[ program_id ] = title_id;
+                               return; // Continue reading of the current table.
+                       }
+                       else if (!checkTimeout())
+                               return;
                }
-               if ( seenPrivateSections.size() == (unsigned int)(data[7] + 1) )
+               if ( !m_program_ids.empty())
                {
-                       eDebug("[EPGC] private finished");
-                       if (!isRunning)
-                               can_delete = 1;
-                       m_PrevVersion = (data[5] & 0x3E) >> 1;
-                       m_PrivateReader->stop();
-                       startPrivateTimer.start(UPDATE_INTERVAL, 1);
+                       // Titles table has been read, there are summaries to read.
+                       // Start reading summaries, store corresponding titles on the fly.
+                       startMHWReader(0xD3, 0x90);
+                       eDebug("[EPGC] mhw %d titles(%d with summary) found",
+                               m_titles.size(),
+                               m_program_ids.size());
+                       startTimeout(4000);
+                       return;
                }
        }
+       else if (m_MHWFilterMask.pid == 0xD3 && m_MHWFilterMask.data[0] == 0x90)
+       // Summaries table
+       {
+               mhw_summary_t *summary = (mhw_summary_t*) data;
+
+               // Create unique key per record
+               __u32 program_id = ((summary->program_id_hi)<<24)|((summary->program_id_mh)<<16)|
+                       ((summary->program_id_ml)<<8)|(summary->program_id_lo);
+               int len = ((data[1]&0xf)<<8) + data[2];
+
+               // ugly workaround to convert const __u8* to char*
+               char *tmp=0;
+               memcpy(&tmp, &data, sizeof(void*));
+               tmp[len+3] = 0; // Terminate as a string.
+
+               std::map<__u32, __u32>::iterator itProgid( m_program_ids.find( program_id ) );
+               if ( itProgid == m_program_ids.end() )
+               { /*    This part is to prevent to looping forever if some summaries are not received yet.
+                       There is a timeout of 4 sec. after the last successfully read summary. */
+                       if (!m_program_ids.empty() && !checkTimeout())
+                               return; // Continue reading of the current table.
+               }
+               else
+               {
+                       std::string the_text = (char *) (data + 11 + summary->nb_replays * 7);
+
+                       unsigned int pos=0;
+                       while((pos = the_text.find("\r\n")) != std::string::npos)
+                               the_text.replace(pos, 2, " ");
+
+                       // Find corresponding title, store title and summary in epgcache.
+                       std::map<__u32, mhw_title_t>::iterator itTitle( m_titles.find( itProgid->second ) );
+                       if ( itTitle != m_titles.end() )
+                       {
+                               startTimeout(4000);
+                               storeTitle( itTitle, the_text, data );
+                               m_titles.erase( itTitle );
+                       }
+                       m_program_ids.erase( itProgid );
+                       if ( !m_program_ids.empty() )
+                               return; // Continue reading of the current table.
+               }
+       }
+       eDebug("[EPGC] mhw finished(%ld) %d summaries not found",
+               eDVBLocalTimeHandler::getInstance()->nowTime(),
+               m_program_ids.size());
+       // Summaries have been read, titles that have summaries have been stored.
+       // Now store titles that do not have summaries.
+       for (std::map<__u32, mhw_title_t>::iterator itTitle(m_titles.begin()); itTitle != m_titles.end(); itTitle++)
+               storeTitle( itTitle, "", data );
+       isRunning &= ~MHW;
+       m_MHWConn=0;
+       if ( m_MHWReader )
+               m_MHWReader->stop();
+       if (haveData)
+               finishEPG();
 }
 
-#endif // ENABLE_PRIVATE_EPG
+void eEPGCache::channel_data::readMHWData2(const __u8 *data)
+{
+       int dataLen = (((data[1]&0xf) << 8) | data[2]) + 3;
+
+       if ( m_MHWReader )
+               m_MHWReader->stop();
+
+       if ( state > 1 || // aborted
+               // have si data.. so we dont read mhw data
+               (haveData & (eEPGCache::SCHEDULE|eEPGCache::SCHEDULE_OTHER)) )
+       {
+               eDebug("[EPGC] mhw2 aborted %d", state);
+       }
+       else if (m_MHWFilterMask2.pid == 0x231 && m_MHWFilterMask2.data[0] == 0xC8 && m_MHWFilterMask2.data[1] == 0)
+       // Channels table
+       {
+               int num_channels = data[120];
+               if(dataLen > 120)
+               {
+                       int ptr = 121 + 6 * num_channels;
+                       if( dataLen > ptr )
+                       {
+                               for( int chid = 0; chid < num_channels; ++chid )
+                               {
+                                       ptr += ( data[ptr] & 0x0f ) + 1;
+                                       if( dataLen < ptr )
+                                               goto abort;
+                               }
+                       }
+                       else
+                               goto abort;
+               }
+               else
+                       goto abort;
+               // data seems consistent...
+               const __u8 *tmp = data+121;
+               for (int i=0; i < num_channels; ++i)
+               {
+                       mhw_channel_name_t channel;
+                       channel.transport_stream_id_hi = *(tmp++);
+                       channel.transport_stream_id_lo = *(tmp++);
+                       channel.channel_id_hi = *(tmp++);
+                       channel.channel_id_lo = *(tmp++);
+#warning FIXME hardcoded network_id in mhw2 epg
+                       channel.network_id_hi = 0; // hardcoded astra 19.2
+                       channel.network_id_lo = 1;
+                       m_channels.push_back(channel);
+                       tmp+=2;
+               }
+               for (int i=0; i < num_channels; ++i)
+               {
+                       mhw_channel_name_t &channel = m_channels[i];
+                       int channel_name_len=*(tmp++)&0x0f;
+                       int x=0;
+                       for (; x < channel_name_len; ++x)
+                               channel.name[x]=*(tmp++);
+                       channel.name[x+1]=0;
+               }
+               haveData |= MHW;
+               eDebug("[EPGC] mhw2 %d channels found", m_channels.size());
+       }
+       else if (m_MHWFilterMask2.pid == 0x231 && m_MHWFilterMask2.data[0] == 0xC8 && m_MHWFilterMask2.data[1] == 1)
+       {
+               // Themes table
+               eDebug("[EPGC] mhw2 themes nyi");
+       }
+       else if (m_MHWFilterMask2.pid == 0x234 && m_MHWFilterMask2.data[0] == 0xe6)
+       // Titles table
+       {
+               int pos=18;
+               bool valid=true;
+               int len = ((data[1]&0xf)<<8) + data[2] - 16;
+               bool finish=false;
+               if(data[dataLen-1] != 0xff)
+                       return;
+               while( pos < dataLen )
+               {
+                       valid = false;
+                       pos += 7;
+                       if( pos < dataLen )
+                       {
+                               pos += 3;
+                               if( pos < dataLen )
+                               {
+                                       if( data[pos] > 0xc0 )
+                                       {
+                                               pos += ( data[pos] - 0xc0 );
+                                               pos += 4;
+                                               if( pos < dataLen )
+                                               {
+                                                       if( data[pos] == 0xff )
+                                                       {
+                                                               ++pos;
+                                                               valid = true;
+                                                       }
+                                               }
+                                       }
+                               }
+                       }
+                       if( !valid )
+                       {
+                               if (checkTimeout())
+                                       goto start_summary;
+                               return;
+                       }
+               }
+               // data seems consistent...
+               mhw_title_t title;
+               pos = 18;
+               while (pos < len)
+               {
+                       title.channel_id = data[pos]+1;
+                       title.program_id_ml = data[pos+1];
+                       title.program_id_lo = data[pos+2];
+                       title.mhw2_mjd_hi = data[pos+3];
+                       title.mhw2_mjd_lo = data[pos+4];
+                       title.mhw2_hours = data[pos+5];
+                       title.mhw2_minutes = data[pos+6];
+                       title.mhw2_seconds = data[pos+7];
+                       int duration = ((data[pos+8] << 8)|data[pos+9]) >> 4;
+                       title.mhw2_duration_hi = (duration&0xFF00) >> 8;
+                       title.mhw2_duration_lo = duration&0xFF;
+                       __u8 slen = data[pos+10] & 0x3f;
+                       __u8 *dest = ((__u8*)title.title)-4;
+                       memcpy(dest, &data[pos+11], slen>33 ? 33 : slen);
+                       memset(dest+slen, 0x20, 33-slen);
+                       pos += 11 + slen;
+//                     not used theme id (data[7] & 0x3f) + (data[pos] & 0x3f);
+                       __u32 summary_id = (data[pos+1] << 8) | data[pos+2];
+
+                       // Create unique key per title
+                       __u32 title_id = (title.channel_id<<16) | (title.program_id_ml<<8) | title.program_id_lo;
+
+//                     eDebug("program_id: %08x, %s", program_id,
+//                             std::string((const char *)title.title, (int)(slen > 23 ? 23 : slen)).c_str());
+
+                       pos += 4;
+
+                       if ( m_titles.find( title_id ) == m_titles.end() )
+                       {
+                               startTimeout(4000);
+                               m_titles[ title_id ] = title;
+                               if (summary_id != 0xFFFF &&  // no summary avail
+                                       m_program_ids.find(summary_id) == m_program_ids.end())
+                               {
+                                       m_program_ids[ summary_id ] = title_id;
+                               }
+                       }
+                       else
+                       {
+                               if ( !checkTimeout() )
+                                       continue;       // Continue reading of the current table.
+                               finish=true;
+                               break;
+                       }
+               }
+start_summary:
+               if (finish)
+               {
+                       eDebug("[EPGC] mhw2 %d titles(%d with summary) found", m_titles.size(), m_program_ids.size());
+                       if (!m_program_ids.empty())
+                       {
+                               // Titles table has been read, there are summaries to read.
+                               // Start reading summaries, store corresponding titles on the fly.
+                               startMHWReader2(0x236, 0x96);
+                               startTimeout(4000);
+                               return;
+                       }
+               }
+               else
+                       return;
+       }
+       else if (m_MHWFilterMask2.pid == 0x236 && m_MHWFilterMask2.data[0] == 0x96)
+       // Summaries table
+       {
+               int len, loop, pos, lenline;
+               bool valid;
+               valid = true;
+               if( dataLen > 18 )
+               {
+                       loop = data[12];
+                       pos = 13 + loop;
+                       if( dataLen > pos )
+                       {
+                               loop = data[pos] & 0x0f;
+                               pos += 1;
+                               if( dataLen > pos )
+                               {
+                                       len = 0;
+                                       for( ; loop > 0; --loop )
+                                       {
+                                               if( dataLen > (pos+len) )
+                                               {
+                                                       lenline = data[pos+len];
+                                                       len += lenline + 1;
+                                               }
+                                               else
+                                                       valid=false;
+                                       }
+                               }
+                       }
+               }
+               else if (!checkTimeout())
+                       return;  // continue reading
+               if (valid && !checkTimeout())
+               {
+                       // data seems consistent...
+                       __u32 summary_id = (data[3]<<8)|data[4];
+
+                       // ugly workaround to convert const __u8* to char*
+                       char *tmp=0;
+                       memcpy(&tmp, &data, sizeof(void*));
+
+                       len = 0;
+                       loop = data[12];
+                       pos = 13 + loop;
+                       loop = tmp[pos] & 0x0f;
+                       pos += 1;
+                       for( ; loop > 0; loop -- )
+                       {
+                               lenline = tmp[pos+len];
+                               tmp[pos+len] = ' ';
+                               len += lenline + 1;
+                       }
+                       if( len > 0 )
+                           tmp[pos+len] = 0;
+                       else
+                               tmp[pos+1] = 0;
+
+                       std::map<__u32, __u32>::iterator itProgid( m_program_ids.find( summary_id ) );
+                       if ( itProgid == m_program_ids.end() )
+                       { /*    This part is to prevent to looping forever if some summaries are not received yet.
+                               There is a timeout of 4 sec. after the last successfully read summary. */
+       
+                               if ( !m_program_ids.empty() && !checkTimeout() )
+                                       return; // Continue reading of the current table.
+                       }
+                       else
+                       {
+                               startTimeout(4000);
+                               std::string the_text = (char *) (data + pos + 1);
+
+                               // Find corresponding title, store title and summary in epgcache.
+                               std::map<__u32, mhw_title_t>::iterator itTitle( m_titles.find( itProgid->second ) );
+                               if ( itTitle != m_titles.end() )
+                               {
+                                       storeTitle( itTitle, the_text, data );
+                                       m_titles.erase( itTitle );
+                               }
+                               m_program_ids.erase( itProgid );
+                               if ( !m_program_ids.empty() )
+                                       return; // Continue reading of the current table.
+                       }
+               }
+       }
+       if (isRunning & eEPGCache::MHW)
+       {
+               if ( m_MHWFilterMask2.pid == 0x231 && m_MHWFilterMask2.data[0] == 0xC8 && m_MHWFilterMask2.data[1] == 0)
+               {
+                       // Channels table has been read, start reading the themes table.
+                       startMHWReader2(0x231, 0xC8, 1);
+                       return;
+               }
+               else if ( m_MHWFilterMask2.pid == 0x231 && m_MHWFilterMask2.data[0] == 0xC8 && m_MHWFilterMask2.data[1] == 1)
+               {
+                       // Themes table has been read, start reading the titles table.
+                       startMHWReader2(0x234, 0xe6);
+                       return;
+               }
+               else
+               {
+                       // Summaries have been read, titles that have summaries have been stored.
+                       // Now store titles that do not have summaries.
+                       for (std::map<__u32, mhw_title_t>::iterator itTitle(m_titles.begin()); itTitle != m_titles.end(); itTitle++)
+                               storeTitle( itTitle, "", data );
+                       eDebug("[EPGC] mhw2 finished(%ld) %d summaries not found",
+                               eDVBLocalTimeHandler::getInstance()->nowTime(),
+                               m_program_ids.size());
+               }
+       }
+abort:
+       isRunning &= ~MHW;
+       m_MHWConn2=0;
+       if ( m_MHWReader2 )
+               m_MHWReader2->stop();
+       if (haveData)
+               finishEPG();
+}
+#endif