diff options
| author | Frank Neumann <fnu@yavdr.org> | 2017-05-07 10:39:01 +0200 |
|---|---|---|
| committer | Frank Neumann <fnu@yavdr.org> | 2017-05-07 10:39:01 +0200 |
| commit | 26a17d704a9396897d17aa12d877ef23eaa5dd50 (patch) | |
| tree | cb73880b7a2bf489c5007185579ae5f740300279 /menu_main.c | |
| parent | cf9d8e7257ef26b80d3998d4cdb12cd1e39d5e5c (diff) | |
| download | vdr-plugin-epgsearch-26a17d704a9396897d17aa12d877ef23eaa5dd50.tar.gz vdr-plugin-epgsearch-26a17d704a9396897d17aa12d877ef23eaa5dd50.tar.bz2 | |
Commit 0003-revert-now-obsolete-pointer-params.diff (thx TomJoad@vdr-portal.de)
Diffstat (limited to 'menu_main.c')
| -rw-r--r-- | menu_main.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/menu_main.c b/menu_main.c index e776599..9b541dc 100644 --- a/menu_main.c +++ b/menu_main.c @@ -174,11 +174,11 @@ void cMenuSearchMain::PrepareSchedule(const cChannel *Channel) } } -bool cMenuSearchMain::Update(const cTimers* vdrtimers) +bool cMenuSearchMain::Update(void) { bool result = false; for (cOsdItem *item = First(); item; item = Next(item)) { - if (item->Selectable() && ((cMenuMyScheduleItem *)item)->Update(vdrtimers)) + if (item->Selectable() && ((cMenuMyScheduleItem *)item)->Update()) result = true; } return result; @@ -280,7 +280,7 @@ eOSState cMenuSearchMain::Record(void) if (HasSubMenu()) CloseSubMenu(); - if (Update(vdrtimers)) + if (Update()) Display(); SetHelpKeys(); } @@ -599,12 +599,6 @@ eOSState cMenuSearchMain::ProcessKey(eKeys Key) const cChannel *ch = cMenuWhatsOnSearch::ScheduleChannel(); InWhatsOnMenu = false; InFavoritesMenu = false; -#if VDRVERSNUM > 20300 - LOCK_TIMERS_READ; - const cTimers *vdrtimers = Timers; -#else - cTimers *vdrtimers = &Timers; -#endif if (ch) { // when switch from the other menus to the schedule, try to keep the same time if (cMenuWhatsOnSearch::shiftTime) @@ -621,7 +615,7 @@ eOSState cMenuSearchMain::ProcessKey(eKeys Key) } Display(); } - else if ((HadSubMenu || gl_TimerProgged) && Update(vdrtimers)) + else if ((HadSubMenu || gl_TimerProgged) && Update()) { if (gl_TimerProgged) // when using epgsearch's timer edit menu, update is delayed because of SVDRP { |