X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/66f5402c111a563e2aa1089c86683ea24aea1957..afb996e31e73607e2ef25ba679a15f15c94701e4:/lib/dvb/epgcache.cpp

diff --git a/lib/dvb/epgcache.cpp b/lib/dvb/epgcache.cpp
index 3b40efcb..c1f294a6 100644
--- 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)
-	:ByteSize(size), type(type)
+	:ByteSize(size&0xFF), type(type&0xFF)
 {
 	if (!e)
 		return;
@@ -188,7 +188,7 @@ void eEPGCache::DVBChannelAdded(eDVBChannel *chan)
 {
 	if ( chan )
 	{
-		eDebug("[eEPGCache] add channel %p", chan);
+//		eDebug("[eEPGCache] add channel %p", chan);
 		channel_data *data = new channel_data(this);
 		data->channel = chan;
 		singleLock s(channel_map_lock);
@@ -258,12 +258,6 @@ void eEPGCache::DVBChannelStateChanged(iDVBChannel *chan)
 		chan->getState(state);
 		switch (state)
 		{
-			case iDVBChannel::state_idle:
-				break;
-			case iDVBChannel::state_tuning:
-				break;
-			case iDVBChannel::state_unavailable:
-				break;
 			case iDVBChannel::state_ok:
 			{
 				eDebug("[eEPGCache] channel %p running", chan);
@@ -753,14 +747,6 @@ void eEPGCache::save()
 #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)
@@ -1010,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);
@@ -1051,7 +1037,7 @@ RESULT eEPGCache::lookupEvent(const eServiceReferenceDVB &service, time_t t, con
 	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;
@@ -1061,7 +1047,7 @@ RESULT eEPGCache::lookupEvent(const eServiceReferenceDVB &service, time_t t, con
 	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;
@@ -1071,7 +1057,7 @@ RESULT eEPGCache::lookupEvent(const eServiceReferenceDVB &service, time_t t, Eve
 	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;
@@ -1085,7 +1071,7 @@ RESULT eEPGCache::lookupEvent(const eServiceReferenceDVB &service, time_t t, ePt
 	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 );
@@ -1108,7 +1094,7 @@ RESULT eEPGCache::lookupEvent(const eServiceReferenceDVB &service, int event_id,
 	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;
@@ -1118,7 +1104,7 @@ RESULT eEPGCache::lookupEvent(const eServiceReferenceDVB &service, int event_id,
 	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;
@@ -1128,7 +1114,7 @@ RESULT eEPGCache::lookupEvent(const eServiceReferenceDVB &service, int event_id,
 	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;
@@ -1142,7 +1128,7 @@ RESULT eEPGCache::lookupEvent(const eServiceReferenceDVB &service, int event_id,
 	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() )
@@ -1159,6 +1145,8 @@ RESULT eEPGCache::startTimeQuery(const eServiceReferenceDVB &service, time_t beg
 					m_timemap_cursor = it;
 			}
 		}
+		else
+			m_timemap_cursor = It->second.second.begin();
 		return 0;
 	}
 	return -1;