aboutsummaryrefslogtreecommitdiff
path: root/lib/dvb/epgcache.cpp
diff options
context:
space:
mode:
authorFraxinas <andreas.frisch@multimedia-labs.de>2010-06-11 23:06:20 +0200
committerFraxinas <andreas.frisch@multimedia-labs.de>2010-06-11 23:06:20 +0200
commit681626f670c65e4ab063dd08840559c767da32fb (patch)
treea32042ee478ead46931db2429fd97c46a7322d44 /lib/dvb/epgcache.cpp
parentf7f442a1d0845e7dfd923c1d783eb612357f3e94 (diff)
parent1445e37b9d2b2d17009cf2b91c24b895a288a702 (diff)
downloadenigma2-681626f670c65e4ab063dd08840559c767da32fb.tar.gz
enigma2-681626f670c65e4ab063dd08840559c767da32fb.zip
Merge branch 'experimental' of git.opendreambox.org:/git/enigma2 into experimental
Diffstat (limited to 'lib/dvb/epgcache.cpp')
-rw-r--r--lib/dvb/epgcache.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/dvb/epgcache.cpp b/lib/dvb/epgcache.cpp
index 48cbfbfd..1e8414c3 100644
--- a/lib/dvb/epgcache.cpp
+++ b/lib/dvb/epgcache.cpp
@@ -1457,7 +1457,7 @@ void eEPGCache::channel_data::readData( const __u8 *data)
}
tidMap &seenSections = this->seenSections[map];
tidMap &calcedSections = this->calcedSections[map];
- if ( state == 1 && calcedSections == seenSections || state > 1 )
+ if ( (state == 1 && calcedSections == seenSections) || state > 1 )
{
eDebugNoNewLine("[EPGC] ");
switch (source)
@@ -2562,7 +2562,7 @@ void eEPGCache::PMTready(eDVBServicePMTHandler *pmthandler)
{
__u8 buffer[10];
(*desc)->writeToBuffer(buffer);
- if (!strncmp((unsigned char*)buffer+2, "EPGDATA", 7))
+ if (!strncmp((char*)buffer+2, "EPGDATA", 7))
{
eServiceReferenceDVB ref;
if (!pmthandler->getServiceReference(ref))
@@ -2571,7 +2571,7 @@ void eEPGCache::PMTready(eDVBServicePMTHandler *pmthandler)
messages.send(Message(Message::got_mhw2_channel_pid, ref, pid));
}
}
- else if(!strncmp((unsigned char*)buffer+2, "FICHAS", 6))
+ else if(!strncmp((char*)buffer+2, "FICHAS", 6))
{
eServiceReferenceDVB ref;
if (!pmthandler->getServiceReference(ref))
@@ -2580,7 +2580,7 @@ void eEPGCache::PMTready(eDVBServicePMTHandler *pmthandler)
messages.send(Message(Message::got_mhw2_summary_pid, ref, pid));
}
}
- else if(!strncmp((unsigned char*)buffer+2, "GENEROS", 7))
+ else if(!strncmp((char*)buffer+2, "GENEROS", 7))
{
eServiceReferenceDVB ref;
if (!pmthandler->getServiceReference(ref))