X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/761cde6e77261e8ee7680510705b6283a734c2af..d7ade1df1e1d8e0259378d783a38ae49e3271fd6:/lib/dvb/epgcache.cpp

diff --git a/lib/dvb/epgcache.cpp b/lib/dvb/epgcache.cpp
index 81b96a82..247b0c05 100644
--- a/lib/dvb/epgcache.cpp
+++ b/lib/dvb/epgcache.cpp
@@ -372,8 +372,9 @@ void eEPGCache::DVBChannelStateChanged(iDVBChannel *chan)
 	}
 }
 
-void eEPGCache::FixOverlapping(std::pair<eventMap,timeMap> &servicemap, time_t TM, int duration, const timeMap::iterator &tm_it, const uniqueEPGKey &service)
+bool eEPGCache::FixOverlapping(std::pair<eventMap,timeMap> &servicemap, time_t TM, int duration, const timeMap::iterator &tm_it, const uniqueEPGKey &service)
 {
+	bool ret = false;
 	timeMap::iterator tmp = tm_it;
 	while ((tmp->first+tmp->second->getDuration()-300) > TM)
 	{
@@ -406,6 +407,7 @@ void eEPGCache::FixOverlapping(std::pair<eventMap,timeMap> &servicemap, time_t T
 			}
 			else
 				servicemap.second.erase(tmp--);
+			ret = true;
 		}
 		else
 		{
@@ -434,12 +436,14 @@ void eEPGCache::FixOverlapping(std::pair<eventMap,timeMap> &servicemap, time_t T
 #endif
 			delete tmp->second;
 			servicemap.second.erase(tmp++);
+			ret = true;
 		}
 		else
 			++tmp;
 		if (tmp == servicemap.second.end())
 			break;
 	}
+	return ret;
 }
 
 void eEPGCache::sectionRead(const __u8 *data, int source, channel_data *channel)
@@ -523,7 +527,11 @@ void eEPGCache::sectionRead(const __u8 *data, int source, channel_data *channel)
 						eventData *tmp = ev_it->second;
 						ev_it->second = tm_it_tmp->second =
 							new eventData(eit_event, eit_event_size, source);
-						FixOverlapping(servicemap, TM, duration, tm_it_tmp, service);
+						if (FixOverlapping(servicemap, TM, duration, tm_it_tmp, service))
+						{
+							prevEventIt = servicemap.first.end();
+							prevTimeIt = servicemap.second.end();
+						}
 						delete tmp;
 						goto next;
 					}
@@ -596,8 +604,6 @@ void eEPGCache::sectionRead(const __u8 *data, int source, channel_data *channel)
 				tm_it=prevTimeIt=servicemap.second.insert( prevTimeIt, std::pair<const time_t, eventData*>( TM, evt ) );
 			}
 
-			FixOverlapping(servicemap, TM, duration, tm_it, service);
-
 #ifdef EPG_DEBUG
 			if ( consistencyCheck )
 			{
@@ -617,6 +623,11 @@ void eEPGCache::sectionRead(const __u8 *data, int source, channel_data *channel)
 						ev_it->first, event_id );
 			}
 #endif
+			if (FixOverlapping(servicemap, TM, duration, tm_it, service))
+			{
+				prevEventIt = servicemap.first.end();
+				prevTimeIt = servicemap.second.end();
+			}
 		}
 next:
 #ifdef EPG_DEBUG
@@ -1508,33 +1519,30 @@ RESULT eEPGCache::lookupEventId(const eServiceReference &service, int event_id,
 RESULT eEPGCache::startTimeQuery(const eServiceReference &service, time_t begin, int minutes)
 {
 	const eServiceReferenceDVB &ref = (const eServiceReferenceDVB&)handleGroup(service);
+	if (begin == -1)
+		begin = eDVBLocalTimeHandler::getInstance()->nowTime();
 	Lock();
 	eventCache::iterator It = eventDB.find(ref);
 	if ( It != eventDB.end() && It->second.second.size() )
 	{
-		if ( begin != -1 )
+		m_timemap_cursor = It->second.second.lower_bound(begin);
+		if ( m_timemap_cursor != It->second.second.end() )
 		{
-			m_timemap_cursor = It->second.second.lower_bound(begin);
-			if ( m_timemap_cursor != It->second.second.end() )
+			if ( m_timemap_cursor->first != begin )
 			{
-				if ( m_timemap_cursor->first != begin )
+				timeMap::iterator x = m_timemap_cursor;
+				--x;
+				if ( x != It->second.second.end() )
 				{
-					timeMap::iterator x = m_timemap_cursor;
-					--x;
-					if ( x != It->second.second.end() )
-					{
-						time_t start_time = x->first;
-						if ( begin > start_time && begin < (start_time+x->second->getDuration()))
-							m_timemap_cursor = x;
-					}
+					time_t start_time = x->first;
+					if ( begin > start_time && begin < (start_time+x->second->getDuration()))
+						m_timemap_cursor = x;
 				}
 			}
 		}
-		else
-			m_timemap_cursor = It->second.second.begin();
 
-		if (minutes != -1 && m_timemap_cursor != It->second.second.end())
-			m_timemap_end = It->second.second.upper_bound(m_timemap_cursor->first+minutes*60);
+		if (minutes != -1)
+			m_timemap_end = It->second.second.lower_bound(begin+minutes*60);
 		else
 			m_timemap_end = It->second.second.end();
 
@@ -1799,6 +1807,10 @@ PyObject *eEPGCache::lookupEvent(ePyObject list, ePyObject convertFunc)
 						break;
 				}
 			}
+
+			if (minutes && stime == -1)
+				stime = eDVBLocalTimeHandler::getInstance()->nowTime();
+
 			eServiceReference ref(handleGroup(eServiceReference(PyString_AS_STRING(service))));
 			if (ref.type != eServiceReference::idDVB)
 			{
@@ -1873,6 +1885,8 @@ PyObject *eEPGCache::lookupEvent(ePyObject list, ePyObject convertFunc)
 						}
 					}
 				}
+				else
+					handleEvent(0, dest_list, argstring, argcount, service, nowTime, service_name, convertFunc, convertFuncArgs);
 				Unlock();
 			}
 			else
@@ -2253,6 +2267,11 @@ PyObject *eEPGCache::search(ePyObject arg)
 						{
 							if (lookupEventId(ref, evid, ev))
 								eDebug("event not found !!!!!!!!!!!");
+							else
+							{
+								const eServiceReferenceDVB &dref = (const eServiceReferenceDVB&)ref;
+								ptr.parseFrom(ev, (dref.getTransportStreamID().get()<<16)|dref.getOriginalNetworkID().get());
+							}
 						}
 					// create service name
 						if (!service_name)
@@ -2484,7 +2503,7 @@ void eEPGCache::privateSectionRead(const uniqueEPGKey &current_service, const __
 				int sid = data[ptr++] << 8;
 				sid |= data[ptr++];
 
-// WORKAROUND for wrong transmitted epg data (01.08.2006)
+// WORKAROUND for wrong transmitted epg data (01.10.2007)
 				if ( onid == 0x85 )
 				{
 					switch( (tsid << 16) | sid )
@@ -2495,6 +2514,7 @@ void eEPGCache::privateSectionRead(const uniqueEPGKey &current_service, const __
 						case 0x0300f5: sid = 0xdc; break;
 						case 0x0400d2: sid = 0xe2; tsid = 0x11; break;
 						case 0x1100d3: sid = 0xe3; break;
+						case 0x0100d4: sid = 0xe4; tsid = 4; break;
 					}
 				}
 ////////////////////////////////////////////