mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-28 16:01:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

eitd/sectionsd.cpp: remove useless eit.header check

Browse Source
This commit is contained in:
[CST] Focus
2012-02-08 19:30:08 +04:00
parent 369671c36e
commit 6b4ca562b4
1 changed files with 62 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

126
src/eitd/sectionsd.cpp
View File

@@ -3059,43 +3059,43 @@ static void *fseitThread(void *)
SIsectionEIT eit(static_buf); SIsectionEIT eit(static_buf);
// Houdini: if section is not parsed (too short) -> no need to check events // Houdini: if section is not parsed (too short) -> no need to check events
if (eit.is_parsed() && eit.header()) if (!eit.is_parsed())
continue;
//dprintf("[eitThread] adding %d events [table 0x%x] (begin)\n", eit.events().size(), eit.getTableId());
zeit = time(NULL);
// Nicht alle Events speichern
for (SIevents::iterator e = eit.events().begin(); e != eit.events().end(); e++)
{ {
//dprintf("[eitThread] adding %d events [table 0x%x] (begin)\n", eit.events().size(), eit.getTableId()); if (!(e->times.empty()))
zeit = time(NULL);
// Nicht alle Events speichern
for (SIevents::iterator e = eit.events().begin(); e != eit.events().end(); e++)
{ {
if (!(e->times.empty())) if ( ( e->times.begin()->startzeit < zeit + secondsToCache ) &&
( ( e->times.begin()->startzeit + (long)e->times.begin()->dauer ) > zeit - oldEventsAre ) )
{ {
if ( ( e->times.begin()->startzeit < zeit + secondsToCache ) && addEvent(*e, zeit);
( ( e->times.begin()->startzeit + (long)e->times.begin()->dauer ) > zeit - oldEventsAre ) )
{
addEvent(*e, zeit);
}
} }
else }
else
{
// pruefen ob nvod event
readLockServices();
MySIservicesNVODorderUniqueKey::iterator si = mySIservicesNVODorderUniqueKey.find(e->get_channel_id());
if (si != mySIservicesNVODorderUniqueKey.end())
{ {
// pruefen ob nvod event // Ist ein nvod-event
readLockServices(); writeLockEvents();
MySIservicesNVODorderUniqueKey::iterator si = mySIservicesNVODorderUniqueKey.find(e->get_channel_id());
if (si != mySIservicesNVODorderUniqueKey.end()) for (SInvodReferences::iterator i = si->second->nvods.begin(); i != si->second->nvods.end(); i++)
{ mySIeventUniqueKeysMetaOrderServiceUniqueKey.insert(std::make_pair(i->uniqueKey(), e->uniqueKey()));
// Ist ein nvod-event
writeLockEvents();
for (SInvodReferences::iterator i = si->second->nvods.begin(); i != si->second->nvods.end(); i++) unlockEvents();
mySIeventUniqueKeysMetaOrderServiceUniqueKey.insert(std::make_pair(i->uniqueKey(), e->uniqueKey())); addNVODevent(*e);
unlockEvents();
addNVODevent(*e);
}
unlockServices();
} }
} // for unlockServices();
//dprintf("[eitThread] added %d events (end)\n", eit.events().size()); }
} // if } // for
//dprintf("[eitThread] added %d events (end)\n", eit.events().size());
} // for } // for
delete[] static_buf; delete[] static_buf;
dputs("[freesatEitThread] end"); dputs("[freesatEitThread] end");
@@ -3273,48 +3273,46 @@ static void *eitThread(void *)
SIsectionEIT eit(static_buf); SIsectionEIT eit(static_buf);
// Houdini: if section is not parsed (too short) -> no need to check events // Houdini: if section is not parsed (too short) -> no need to check events
if (eit.is_parsed() && eit.header()) if (!eit.is_parsed())
continue;
dprintf("[eitThread] adding %d events [table 0x%x] (begin)\n", eit.events().size(), eit.getTableId());
zeit = time(NULL);
// Nicht alle Events speichern
for (SIevents::iterator e = eit.events().begin(); e != eit.events().end(); e++)
{ {
// == 0 -> kein event if (!(e->times.empty()))
dprintf("[eitThread] adding %d events [table 0x%x] (begin)\n", eit.events().size(), eit.getTableId());
zeit = time(NULL);
// Nicht alle Events speichern
for (SIevents::iterator e = eit.events().begin(); e != eit.events().end(); e++)
{ {
if (!(e->times.empty())) if ( ( e->times.begin()->startzeit < zeit + secondsToCache ) &&
( ( e->times.begin()->startzeit + (long)e->times.begin()->dauer ) > zeit - oldEventsAre ) )
{ {
if ( ( e->times.begin()->startzeit < zeit + secondsToCache ) && if(sectionsd_stop)
( ( e->times.begin()->startzeit + (long)e->times.begin()->dauer ) > zeit - oldEventsAre ) ) break;
{ //printf("Adding event 0x%llx table %x version %x running %d\n", e->uniqueKey(), eit.getTableId(), eit.getVersionNumber(), e->runningStatus());
if(sectionsd_stop) addEvent(*e, zeit);
break;
//printf("Adding event 0x%llx table %x version %x running %d\n", e->uniqueKey(), eit.getTableId(), eit.getVersionNumber(), e->runningStatus());
addEvent(*e, zeit);
}
} }
else }
else
{
// pruefen ob nvod event
readLockServices();
MySIservicesNVODorderUniqueKey::iterator si = mySIservicesNVODorderUniqueKey.find(e->get_channel_id());
if (si != mySIservicesNVODorderUniqueKey.end())
{ {
// pruefen ob nvod event // Ist ein nvod-event
readLockServices(); writeLockEvents();
MySIservicesNVODorderUniqueKey::iterator si = mySIservicesNVODorderUniqueKey.find(e->get_channel_id());
if (si != mySIservicesNVODorderUniqueKey.end()) for (SInvodReferences::iterator i = si->second->nvods.begin(); i != si->second->nvods.end(); i++)
{ mySIeventUniqueKeysMetaOrderServiceUniqueKey.insert(std::make_pair(i->uniqueKey(), e->uniqueKey()));
// Ist ein nvod-event
writeLockEvents();
for (SInvodReferences::iterator i = si->second->nvods.begin(); i != si->second->nvods.end(); i++) unlockEvents();
mySIeventUniqueKeysMetaOrderServiceUniqueKey.insert(std::make_pair(i->uniqueKey(), e->uniqueKey())); addNVODevent(*e);
unlockEvents();
addNVODevent(*e);
}
unlockServices();
} }
} // for unlockServices();
//dprintf("[eitThread] added %d events (end)\n", eit.events().size()); }
} // if } // for
//dprintf("[eitThread] added %d events (end)\n", eit.events().size());
} // for } // for
delete[] static_buf; delete[] static_buf;
@@ -3514,7 +3512,7 @@ static void *cnThread(void *)
SIsectionEIT eit(static_buf); SIsectionEIT eit(static_buf);
// Houdini: if section is not parsed (too short) -> no need to check events // Houdini: if section is not parsed (too short) -> no need to check events
if (!eit.is_parsed() || !eit.header()) if (!eit.is_parsed())
continue; continue;
//dprintf("[cnThread] adding %d events [table 0x%x] (begin)\n", eit.events().size(), eit.getTableId()); //dprintf("[cnThread] adding %d events [table 0x%x] (begin)\n", eit.events().size(), eit.getTableId());