diff options
| author | Andreas Monzner <andreas.monzner@multimedia-labs.de> | 2006-07-25 19:24:11 +0000 |
|---|---|---|
| committer | Andreas Monzner <andreas.monzner@multimedia-labs.de> | 2006-07-25 19:24:11 +0000 |
| commit | 1fef713f9d9bb5b87e0d719c768d4b721788caf4 (patch) | |
| tree | 422920af7e85d8929886c434126ad595a64cbda8 /lib | |
| parent | 04bfc6964eccb8ecc3cbcb4f73f84df1b9ba9096 (diff) | |
| download | enigma2-1fef713f9d9bb5b87e0d719c768d4b721788caf4.tar.gz enigma2-1fef713f9d9bb5b87e0d719c768d4b721788caf4.zip | |
remove unneeded workaround
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/dvb/epgcache.cpp | 16 | ||||
| -rw-r--r-- | lib/dvb/epgcache.h | 2 |
2 files changed, 3 insertions, 15 deletions
diff --git a/lib/dvb/epgcache.cpp b/lib/dvb/epgcache.cpp index 974e9f7b..ba777452 100644 --- 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(); - 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); } @@ -2418,22 +2419,9 @@ void eEPGCache::channel_data::readPrivateData( const __u8 *data) { 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]); -#endif } if ( seenPrivateSections.size() == (unsigned int)(data[7] + 1) ) { diff --git a/lib/dvb/epgcache.h b/lib/dvb/epgcache.h index 749854a5..81815ed5 100644 --- a/lib/dvb/epgcache.h +++ b/lib/dvb/epgcache.h @@ -2,7 +2,7 @@ #define __epgcache_h_ #define ENABLE_PRIVATE_EPG 1 -#define NEED_DEMUX_WORKAROUND 1 +#define ENABLE_MHW_EPG 1 #ifndef SWIG |