parsing for /etc/timezone.xml added

[enigma2.git] / lib / dvb / epgcache.cpp

diff --git a/lib/dvb/epgcache.cpp b/lib/dvb/epgcache.cpp
index f8ffb975ca9d62897f4e828cfc5c5de6e05ce78e..c1f294a6cba3b643a681eaf7d78dc1ec0f35142e 100644 (file)
--- a/lib/dvb/epgcache.cpp
+++ b/lib/dvb/epgcache.cpp
@@ -15,7 +15,7 @@ __u8 eventData::data[4108];
 extern const uint32_t crc32_table[256];
 
 eventData::eventData(const eit_event_struct* e, int size, int type)
 extern const uint32_t crc32_table[256];
 
 eventData::eventData(const eit_event_struct* e, int size, int type)

-       :ByteSize(size), type(type)
+       :ByteSize(size&0xFF), type(type&0xFF)

 {
        if (!e)
                return;
 {
        if (!e)
                return;


@@ -747,14 +747,6 @@ void eEPGCache::save()
 #endif
 }
 
 #endif
 }
 

-RESULT eEPGCache::getInstance(ePtr<eEPGCache> &ptr)
-{
-       ptr = instance;
-       if (!ptr)
-               return -1;
-       return 0;
-}
-

 eEPGCache::channel_data::channel_data(eEPGCache *ml)
        :cache(ml)
        ,abortTimer(ml), zapTimer(ml)
 eEPGCache::channel_data::channel_data(eEPGCache *ml)
        :cache(ml)
        ,abortTimer(ml), zapTimer(ml)


@@ -1004,7 +996,7 @@ void eEPGCache::channel_data::readData( const __u8 *data)
        }
 }
 
        }
 }
 

-RESULT eEPGCache::lookupEvent(const eServiceReferenceDVB &service, time_t t, const eventData *&result )
+RESULT eEPGCache::lookupEvent(const eServiceReference &service, time_t t, const eventData *&result )

 // if t == 0 we search the current event...
 {
        singleLock s(cache_lock);
 // if t == 0 we search the current event...
 {
        singleLock s(cache_lock);


@@ -1045,7 +1037,7 @@ RESULT eEPGCache::lookupEvent(const eServiceReferenceDVB &service, time_t t, con
        return -1;
 }
 
        return -1;
 }
 

-RESULT eEPGCache::lookupEvent(const eServiceReferenceDVB &service, time_t t, const eit_event_struct *&result )
+RESULT eEPGCache::lookupEvent(const eServiceReference &service, time_t t, const eit_event_struct *&result )

 {
        singleLock s(cache_lock);
        const eventData *data=0;
 {
        singleLock s(cache_lock);
        const eventData *data=0;


@@ -1055,7 +1047,7 @@ RESULT eEPGCache::lookupEvent(const eServiceReferenceDVB &service, time_t t, con
        return ret;
 }
 
        return ret;
 }
 

-RESULT eEPGCache::lookupEvent(const eServiceReferenceDVB &service, time_t t, Event *& result )
+RESULT eEPGCache::lookupEvent(const eServiceReference &service, time_t t, Event *& result )

 {
        singleLock s(cache_lock);
        const eventData *data=0;
 {
        singleLock s(cache_lock);
        const eventData *data=0;


@@ -1065,7 +1057,7 @@ RESULT eEPGCache::lookupEvent(const eServiceReferenceDVB &service, time_t t, Eve
        return ret;
 }
 
        return ret;
 }
 

-RESULT eEPGCache::lookupEvent(const eServiceReferenceDVB &service, time_t t, ePtr<eServiceEvent> &result )
+RESULT eEPGCache::lookupEvent(const eServiceReference &service, time_t t, ePtr<eServiceEvent> &result )

 {
        singleLock s(cache_lock);
        const eventData *data=0;
 {
        singleLock s(cache_lock);
        const eventData *data=0;


@@ -1079,7 +1071,7 @@ RESULT eEPGCache::lookupEvent(const eServiceReferenceDVB &service, time_t t, ePt
        return ret;
 }
 
        return ret;
 }
 

-RESULT eEPGCache::lookupEvent(const eServiceReferenceDVB &service, int event_id, const eventData *&result )
+RESULT eEPGCache::lookupEvent(const eServiceReference &service, int event_id, const eventData *&result )

 {
        singleLock s(cache_lock);
        uniqueEPGKey key( service );
 {
        singleLock s(cache_lock);
        uniqueEPGKey key( service );


@@ -1102,7 +1094,7 @@ RESULT eEPGCache::lookupEvent(const eServiceReferenceDVB &service, int event_id,
        return -1;
 }
 
        return -1;
 }
 

-RESULT eEPGCache::lookupEvent(const eServiceReferenceDVB &service, int event_id, const eit_event_struct *&result)
+RESULT eEPGCache::lookupEvent(const eServiceReference &service, int event_id, const eit_event_struct *&result)

 {
        singleLock s(cache_lock);
        const eventData *data=0;
 {
        singleLock s(cache_lock);
        const eventData *data=0;


@@ -1112,7 +1104,7 @@ RESULT eEPGCache::lookupEvent(const eServiceReferenceDVB &service, int event_id,
        return ret;
 }
 
        return ret;
 }
 

-RESULT eEPGCache::lookupEvent(const eServiceReferenceDVB &service, int event_id, Event *& result)
+RESULT eEPGCache::lookupEvent(const eServiceReference &service, int event_id, Event *& result)

 {
        singleLock s(cache_lock);
        const eventData *data=0;
 {
        singleLock s(cache_lock);
        const eventData *data=0;


@@ -1122,7 +1114,7 @@ RESULT eEPGCache::lookupEvent(const eServiceReferenceDVB &service, int event_id,
        return ret;
 }
 
        return ret;
 }
 

-RESULT eEPGCache::lookupEvent(const eServiceReferenceDVB &service, int event_id, ePtr<eServiceEvent> &result)
+RESULT eEPGCache::lookupEvent(const eServiceReference &service, int event_id, ePtr<eServiceEvent> &result)

 {
        singleLock s(cache_lock);
        const eventData *data=0;
 {
        singleLock s(cache_lock);
        const eventData *data=0;


@@ -1136,7 +1128,7 @@ RESULT eEPGCache::lookupEvent(const eServiceReferenceDVB &service, int event_id,
        return ret;
 }
 
        return ret;
 }
 

-RESULT eEPGCache::startTimeQuery(const eServiceReferenceDVB &service, time_t begin, int minutes)
+RESULT eEPGCache::startTimeQuery(const eServiceReference &service, time_t begin, int minutes)

 {
        eventCache::iterator It = eventDB.find( service );
        if ( It != eventDB.end() && It->second.second.size() )
 {
        eventCache::iterator It = eventDB.find( service );
        if ( It != eventDB.end() && It->second.second.size() )


@@ -1153,6 +1145,8 @@ RESULT eEPGCache::startTimeQuery(const eServiceReferenceDVB &service, time_t beg
                                        m_timemap_cursor = it;
                        }
                }
                                        m_timemap_cursor = it;
                        }
                }

+               else
+                       m_timemap_cursor = It->second.second.begin();

                return 0;
        }
        return -1;
                return 0;
        }
        return -1;