From 32fd6ae32d45f3fcbceadad44fac17566094b167 Mon Sep 17 00:00:00 2001 From: Christian Wieninger Date: Sun, 17 Feb 2008 19:30:26 +0100 Subject: fixes to compile with vdr-1.5.15 --- patches/vdr-replace-schedulemenu.diff | 33 --------------------------------- 1 file changed, 33 deletions(-) delete mode 100644 patches/vdr-replace-schedulemenu.diff (limited to 'patches/vdr-replace-schedulemenu.diff') diff --git a/patches/vdr-replace-schedulemenu.diff b/patches/vdr-replace-schedulemenu.diff deleted file mode 100644 index 689eb5f..0000000 --- a/patches/vdr-replace-schedulemenu.diff +++ /dev/null @@ -1,33 +0,0 @@ ---- menu.c.org 2005-06-18 12:31:52.000000000 +0200 -+++ menu.c 2005-07-04 19:47:42.000000000 +0200 -@@ -2447,7 +2447,11 @@ - // Initial submenus: - - switch (State) { -- case osSchedule: AddSubMenu(new cMenuSchedule); break; -+ case osSchedule: { -+ cPlugin *p = cPluginManager::GetPlugin("epgsearch"); -+ (p && !p->SetupParse("IsOrgSchedule", "0")) ? AddSubMenu((cOsdMenu *)p->MainMenuAction()) : AddSubMenu(new cMenuSchedule); -+ } -+ break; - case osChannels: AddSubMenu(new cMenuChannels); break; - case osTimers: AddSubMenu(new cMenuTimers); break; - case osRecordings: AddSubMenu(new cMenuRecordings(NULL, 0, true)); break; -@@ -2553,7 +2557,16 @@ - HadSubMenu |= HasSubMenu(); - - switch (state) { -- case osSchedule: return AddSubMenu(new cMenuSchedule); -+ case osSchedule: { -+ cPlugin *p = cPluginManager::GetPlugin("epgsearch"); -+ if (p && !p->SetupParse("IsOrgSchedule", "0")) { -+ return AddSubMenu((cOsdMenu *)p->MainMenuAction()); -+ state = osEnd; -+ } -+ else -+ return AddSubMenu(new cMenuSchedule); -+ } -+ break; - case osChannels: return AddSubMenu(new cMenuChannels); - case osTimers: return AddSubMenu(new cMenuTimers); - case osRecordings: return AddSubMenu(new cMenuRecordings); -- cgit v1.2.3