From 1fef713f9d9bb5b87e0d719c768d4b721788caf4 Mon Sep 17 00:00:00 2001 From: Andreas Monzner Date: Tue, 25 Jul 2006 19:24:11 +0000 Subject: [PATCH] remove unneeded workaround --- lib/dvb/epgcache.cpp | 16 ++-------------- 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 -- 2.30.2