mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-04 04:11:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

sectionsd: revert rev. 1489 as it simply removed too much events

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1525 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: 4489e4143e
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2011-06-07 (Tue, 07 Jun 2011)

Origin message was:
------------------
- sectionsd: revert rev. 1489 as it simply removed too much events

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1525 e54a6e83-5905-42d5-8d5c-058d10e6a962


------------------
This commit was generated by Migit
This commit is contained in:
gixxpunk
2011-06-07 15:43:43 +00:00
parent 42e23b8b3d
commit 70aebf47fc
1 changed files with 6 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/sectionsd/sectionsd.cpp
View File

@@ -1275,8 +1275,6 @@ static void removeDupEvents(void)
MySIeventsOrderServiceUniqueKeyFirstStartTimeEventUniqueKey::iterator e1, e2, del;
/* list of event IDs to delete */
std::vector<event_id_t>to_delete;
unsigned int dauer_diff= 0;
unsigned int startzeit_diff = 0;
readLockEvents();
e1 = mySIeventsOrderServiceUniqueKeyFirstStartTimeEventUniqueKey.begin();
@@ -1292,20 +1290,11 @@ static void removeDupEvents(void)
if ((*e1)->get_channel_id() != (*e2)->get_channel_id())
continue;
/* check for same time */
if( (*e1)->table_id != 0xFF && (*e2)->table_id != 0xFF ) {
if (((*e1)->times.begin()->startzeit != (*e2)->times.begin()->startzeit) ||
((*e1)->times.begin()->dauer != (*e2)->times.begin()->dauer))
continue;
}
// remove servustv && sixx hd crap & co channels (only from save epg)
else {
startzeit_diff = abs((*e1)->times.begin()->startzeit - (*e2)->times.begin()->startzeit);
dauer_diff = abs((*e1)->times.begin()->dauer - (*e2)->times.begin()->dauer);
if (( startzeit_diff > ((*e1)->times.begin()->dauer/2) && (*e1)->times.begin()->dauer > 360 ) ||
( dauer_diff > ((*e1)->times.begin()->dauer/2)))
continue;
}
if ((*e1)->table_id == (*e2)->table_id && ((*e1)->table_id != 0xFF ))
if (((*e1)->times.begin()->startzeit != (*e2)->times.begin()->startzeit) ||
((*e1)->times.begin()->dauer != (*e2)->times.begin()->dauer))
continue;
if ((*e1)->table_id == (*e2)->table_id)
{
dprintf("%s: not removing events %llx %llx, t:%02x '%s'\n", __func__,
(*e1)->uniqueKey(), (*e2)->uniqueKey(), (*e1)->table_id, (*e1)->getName().c_str());
@@ -1314,11 +1303,7 @@ static void removeDupEvents(void)
if ((*e1)->table_id > (*e2)->table_id)
del = e1;
else if ((*e1)->table_id < (*e2)->table_id)
del = e2;
else if((*e1)->table_id == 0xFF )
del = e1;
else
if ((*e1)->table_id < (*e2)->table_id)
del = e2;
dprintf("%s: removing event %llx.%02x '%s'\n", __func__,