{
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;
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