remove unneeded workaround

diff --git a/lib/dvb/epgcache.cpp b/lib/dvb/epgcache.cpp
index 974e9f7bdc57c443281b3f6e98ffec2c7b75e9ae..ba7774521320ffb61cadc55a2e1605cdd8f74ad8 100644 (file)
--- a/lib/dvb/epgcache.cpp
+++ b/lib/dvb/epgcache.cpp
@@ -2406,7 +2406,8 @@ void eEPGCache::channel_data::startPrivateReader()
                mask.mode[3] = 0x3E;
        }
        seenPrivateSections.clear();
                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);
 }
 
        m_PrivateReader->start(mask);
 }
 


@@ -2418,22 +2419,9 @@ void eEPGCache::channel_data::readPrivateData( const __u8 *data)
        {
                if ( seenPrivateSections.find( data[6] ) == seenPrivateSections.end() )
                {
        {
                if ( seenPrivateSections.find( data[6] ) == seenPrivateSections.end() )
                {

-#ifdef NEED_DEMUX_WORKAROUND
-                       int version = data[5];
-                       version = ((version & 0x3E) >> 1);
-                       can_delete = 0;
-                       if ( m_PrevVersion != version )
-                       {
-                               cache->privateSectionRead(m_PrivateService, data);
-                               seenPrivateSections.insert(data[6]);
-                       }
-                       else
-                               eDebug("ignore");
-#else

                        can_delete = 0;
                        cache->privateSectionRead(m_PrivateService, data);
                        seenPrivateSections.insert(data[6]);
                        can_delete = 0;
                        cache->privateSectionRead(m_PrivateService, data);
                        seenPrivateSections.insert(data[6]);

-#endif

                }
                if ( seenPrivateSections.size() == (unsigned int)(data[7] + 1) )
                {
                }
                if ( seenPrivateSections.size() == (unsigned int)(data[7] + 1) )
                {

diff --git a/lib/dvb/epgcache.h b/lib/dvb/epgcache.h
index 749854a5f8191ac3e0a741b24b2a484d28aeaf97..81815ed58a9643b960eb53902c4b972ff59b04e4 100644 (file)
--- a/lib/dvb/epgcache.h
+++ b/lib/dvb/epgcache.h
@@ -2,7 +2,7 @@
 #define __epgcache_h_
 
 #define ENABLE_PRIVATE_EPG 1
 #define __epgcache_h_
 
 #define ENABLE_PRIVATE_EPG 1

-#define NEED_DEMUX_WORKAROUND 1
+#define ENABLE_MHW_EPG 1

 
 #ifndef SWIG
 
 
 #ifndef SWIG