X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/f94e2c9821eb8784ca03b7122485d4720ec6d6e6..358845c0c1b60f79831ee81ccf55c7c5f5d771e3:/lib/dvb/epgcache.cpp?ds=sidebyside

diff --git a/lib/dvb/epgcache.cpp b/lib/dvb/epgcache.cpp
index 6dea73bc..6d811194 100644
--- a/lib/dvb/epgcache.cpp
+++ b/lib/dvb/epgcache.cpp
@@ -191,6 +191,7 @@ void eEPGCache::DVBChannelAdded(eDVBChannel *chan)
 //		eDebug("[eEPGCache] add channel %p", chan);
 		channel_data *data = new channel_data(this);
 		data->channel = chan;
+		data->prevChannelState = -1;
 		singleLock s(channel_map_lock);
 		m_knownChannels.insert( std::pair<iDVBChannel*, channel_data* >(chan, data) );
 		chan->connectStateChange(slot(*this, &eEPGCache::DVBChannelStateChanged), data->m_stateChangedConn);
@@ -256,25 +257,31 @@ void eEPGCache::DVBChannelStateChanged(iDVBChannel *chan)
 	{
 		int state=0;
 		chan->getState(state);
-		switch (state)
+		if ( it->second->prevChannelState != state )
 		{
-			case iDVBChannel::state_ok:
+			switch (state)
 			{
-				eDebug("[eEPGCache] channel %p running", chan);
-				DVBChannelRunning(chan);
-				break;
-			}
-			case iDVBChannel::state_release:
-			{
-				eDebug("[eEPGCache] remove channel %p", chan);
-				messages.send(Message(Message::leaveChannel, chan));
-				while(!it->second->can_delete)
-					usleep(1000);
-				delete it->second;
-				m_knownChannels.erase(it);
-				// -> gotMessage -> abortEPG
-				break;
+				case iDVBChannel::state_ok:
+				{
+					eDebug("[eEPGCache] channel %p running", chan);
+					DVBChannelRunning(chan);
+					break;
+				}
+				case iDVBChannel::state_release:
+				{
+					eDebug("[eEPGCache] remove channel %p", chan);
+					messages.send(Message(Message::leaveChannel, chan));
+					while(!it->second->can_delete)
+						usleep(1000);
+					delete it->second;
+					m_knownChannels.erase(it);
+					// -> gotMessage -> abortEPG
+					break;
+				}
+				default: // ignore all other events
+					return;
 			}
+			it->second->prevChannelState = state;
 		}
 	}
 }
@@ -1008,30 +1015,27 @@ RESULT eEPGCache::lookupEventTime(const eServiceReference &service, time_t t, co
 	{
 		if (!t)
 			t = time(0)+eDVBLocalTimeHandler::getInstance()->difference();
-
-// TODO: optimize this.. why we here search first in timemap.. and then in eventmap??
-		timeMap::iterator i = It->second.second.lower_bound(t);
+		timeMap::iterator i = It->second.second.lower_bound(t);  // find > or equal
 		if ( i != It->second.second.end() )
 		{
-			if ( i != It->second.second.end() )
+			if ( i->second->getStartTime() != t )
 			{
-				if ( t <= i->first+i->second->getDuration() )
+				timeMap::iterator x = i;
+				--x;
+				if ( x != It->second.second.end() )
 				{
-					result = i->second;
-					return 0;
+					time_t start_time = x->second->getStartTime();
+					if (t < start_time)
+						return -1;
+					if (t > (start_time+x->second->getDuration()))
+						return -1;
+					i = x;
 				}
+				else
+					return -1;
 			}
-		}
-
-		for ( eventMap::iterator i( It->second.first.begin() ); i != It->second.first.end(); i++)
-		{
-			int duration = i->second->getDuration();
-			time_t begTime = i->second->getStartTime();
-			if ( t >= begTime && t <= begTime+duration) // then we have found
-			{
-				result = i->second;
-				return 0;
-			}
+			result = i->second;
+			return 0;
 		}
 	}
 	return -1;
@@ -1139,12 +1143,19 @@ RESULT eEPGCache::startTimeQuery(const eServiceReference &service, time_t begin,
 		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.begin() )
+			if ( m_timemap_cursor != It->second.second.end() )
 			{
-				timeMap::iterator it = m_timemap_cursor;
-				--it;
-				if ( (it->second->getStartTime() + it->second->getDuration()) > begin )
-					m_timemap_cursor = it;
+				if ( m_timemap_cursor->second->getStartTime() != begin )
+				{
+					timeMap::iterator x = m_timemap_cursor;
+					--x;
+					if ( x != It->second.second.end() )
+					{
+						time_t start_time = x->second->getStartTime();
+						if ( begin > start_time && begin < (start_time+x->second->getDuration()))
+							m_timemap_cursor = x;
+					}
+				}
 			}
 		}
 		else