frodovdr
/
vdr-plugin-tvguide
mirror of https://projects.vdr-developer.org/git/vdr-plugin-tvguide.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Rework cRecManager::WhatsOnNow

This commit is contained in:
kamel5 2019-07-10 14:55:14 +02:00
parent 059936c6d7
commit c4e25b899c
1 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
recmanager.c
View File

@ -781,31 +781,23 @@ const cEvent **cRecManager::WhatsOnNow(bool nowOrNext, int &numResults) {
std::vector<const cEvent*> tmpResults; std::vector<const cEvent*> tmpResults;
#if VDRVERSNUM >= 20301 #if VDRVERSNUM >= 20301
LOCK_CHANNELS_READ; LOCK_CHANNELS_READ;
const cChannels* channels = Channels;
LOCK_SCHEDULES_READ; LOCK_SCHEDULES_READ;
const cSchedules* schedules = Schedules; const cSchedules* schedules = Schedules;
#else #else
cChannels* channels = &Channels;
cSchedulesLock schedulesLock; cSchedulesLock schedulesLock;
const cSchedules *schedules = cSchedules::Schedules(schedulesLock); const cSchedules *schedules = cSchedules::Schedules(schedulesLock);
#endif #endif
const cChannel *startChannel = NULL, *stopChannel = NULL; const cChannel *startChannel = NULL, *stopChannel = NULL;
if (tvguideConfig.favLimitChannels) { if (tvguideConfig.favLimitChannels) {
#if VDRVERSNUM >= 20301 startChannel = channels->GetByNumber(tvguideConfig.favStartChannel);
startChannel = Channels->GetByNumber(tvguideConfig.favStartChannel); stopChannel = channels->GetByNumber(tvguideConfig.favStopChannel);
stopChannel = Channels->GetByNumber(tvguideConfig.favStopChannel);
} }
if (!startChannel) if (!startChannel)
startChannel = Channels->First(); startChannel = channels->First();
for (const cChannel *channel = startChannel; channel; channel = Channels->Next(channel)) { for (const cChannel *channel = startChannel; channel; channel = channels->Next(channel)) {
#else
startChannel = Channels.GetByNumber(tvguideConfig.favStartChannel);
stopChannel = Channels.GetByNumber(tvguideConfig.favStopChannel);
}
if (!startChannel)
startChannel = Channels.First();
for (const cChannel *channel = startChannel; channel; channel = Channels.Next(channel)) {
#endif
if (channel->GroupSep()) continue; if (channel->GroupSep()) continue;
const cSchedule *Schedule = schedules->GetSchedule(channel); const cSchedule *Schedule = schedules->GetSchedule(channel);
if (!Schedule) continue; if (!Schedule) continue;