diff options
author | Klaus Schmidinger <vdr@tvdr.de> | 2006-01-29 14:04:37 +0100 |
---|---|---|
committer | Klaus Schmidinger <vdr@tvdr.de> | 2006-01-29 14:04:37 +0100 |
commit | ea9a7eebd1397b2fef02b660f33970944a4bb832 (patch) | |
tree | 5b0712b5fc9d526627033551abf33d7ba78ad6c6 /menu.c | |
parent | 778a6b47ca84ba3f8357fb7ac9daa120eeb12d3b (diff) | |
download | vdr-ea9a7eebd1397b2fef02b660f33970944a4bb832.tar.gz vdr-ea9a7eebd1397b2fef02b660f33970944a4bb832.tar.bz2 |
When looking for the present or following EPG event, the running status is now always taken into account
Diffstat (limited to 'menu.c')
-rw-r--r-- | menu.c | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: menu.c 1.406 2006/01/29 11:13:51 kls Exp $ + * $Id: menu.c 1.407 2006/01/29 14:04:37 kls Exp $ */ #include "menu.h" @@ -1245,7 +1245,7 @@ void cMenuSchedule::PrepareScheduleAllThis(const cEvent *Event, const cChannel * if (schedules && Channel) { const cSchedule *Schedule = schedules->GetSchedule(Channel); if (Schedule) { - const cEvent *PresentEvent = Event ? Event : Schedule->GetPresentEvent(Channel->Number() == cDevice::CurrentChannel()); + const cEvent *PresentEvent = Event ? Event : Schedule->GetPresentEvent(); time_t now = time(NULL) - Setup.EPGLinger * 60; for (const cEvent *ev = Schedule->Events()->First(); ev; ev = Schedule->Events()->Next(ev)) { if (ev->EndTime() > now || ev == PresentEvent) @@ -2968,7 +2968,7 @@ static void SetTrackDescriptions(int LiveChannel) if (Schedules) { const cSchedule *Schedule = Schedules->GetSchedule(Channel); if (Schedule) { - const cEvent *Present = Schedule->GetPresentEvent(true); + const cEvent *Present = Schedule->GetPresentEvent(); if (Present) Components = Present->Components(); } @@ -3058,8 +3058,8 @@ void cDisplayChannel::DisplayInfo(void) if (Schedules) { const cSchedule *Schedule = Schedules->GetSchedule(channel); if (Schedule) { - const cEvent *Present = Schedule->GetPresentEvent(true); - const cEvent *Following = Schedule->GetFollowingEvent(true); + const cEvent *Present = Schedule->GetPresentEvent(); + const cEvent *Following = Schedule->GetFollowingEvent(); if (Present != lastPresent || Following != lastFollowing) { SetTrackDescriptions(channel->Number()); displayChannel->SetEvents(Present, Following); |