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

remove obsolete rtl workarounds (thx Gaucho316)

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


Origin commit data
------------------
Branch: ni/coolstream
Commit: 339b869b64
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2011-05-25 (Wed, 25 May 2011)

Origin message was:
------------------
- remove obsolete rtl workarounds (thx Gaucho316)

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


------------------
This commit was generated by Migit
This commit is contained in:
gixxpunk
2011-05-25 16:47:36 +00:00
parent 2e2bb3fe7a
commit 199b44ea27
2 changed files with 1 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/gui/epgview.cpp
View File

@@ -1053,18 +1053,6 @@ void CEpgData::GetPrevNextEPGData( uint64_t id, time_t* startzeit )
break; break;
} }
} }
/* Houdini: dirty RTL double event workaround, if prev/next event has same starttime as actual event skip it */
if ((prev_zeit == *startzeit) && ((i-1) > 0))
{
prev_id = evtlist[i- 2].eventID;
prev_zeit = evtlist[i- 2].startTime;
}
if ((next_zeit == *startzeit) && ((i+1) < (evtlist.size()- 1)))
{
next_id = evtlist[i+ 2].eventID;
next_zeit = evtlist[i+ 2].startTime;
}
} }
// //

11
src/gui/eventlist.cpp
View File

@@ -171,18 +171,9 @@ void EventList::readEvents(const t_channel_id channel_id)
} }
// Houdini added for Private Premiere EPG, start sorted by start date/time // Houdini added for Private Premiere EPG, start sorted by start date/time
sort(evtlist.begin(),evtlist.end(),sortByDateTime); sort(evtlist.begin(),evtlist.end(),sortByDateTime);
// Houdini: dirty workaround for RTL double events, remove them
CChannelEventList::iterator e2;
for ( e=evtlist.begin(); e!=evtlist.end(); ++e )
{
e2 = e+1;
if ( e2!=evtlist.end() && (e->startTime == e2->startTime)) {
evtlist.erase(e2);
}
}
timerlist.clear(); timerlist.clear();
g_Timerd->getTimerList (timerlist); g_Timerd->getTimerList (timerlist);
} }
current_event = (unsigned int)-1; current_event = (unsigned int)-1;