diff options
| author | svntobi <svntobi@cd0d6b48-d4f9-0310-940f-ab8c4eb44d3f> | 2008-03-23 01:15:27 +0000 |
|---|---|---|
| committer | svntobi <svntobi@cd0d6b48-d4f9-0310-940f-ab8c4eb44d3f> | 2008-03-23 01:15:27 +0000 |
| commit | f369caad4c4848f1c9bd85afbf0593a171f01363 (patch) | |
| tree | 096cb782f4d6a6d7694106265bb3f3641b7bb48e /vdr-patch | |
| parent | 3d13d0e55013a7c061c1f65c797bb06f7a141d6f (diff) | |
| download | vdr-plugin-menuorg-f369caad4c4848f1c9bd85afbf0593a171f01363.tar.gz vdr-plugin-menuorg-f369caad4c4848f1c9bd85afbf0593a171f01363.tar.bz2 | |
- Fixed Enabling/Disabling of CustomMenu
- Fixed Setup Menu
- Adding unconfigured Plug-ins again
git-svn-id: file:///home/tobias/sandbox/vdr/--/vdr-pkg/vdr-pkg/menuorg/trunk@6969 cd0d6b48-d4f9-0310-940f-ab8c4eb44d3f
Diffstat (limited to 'vdr-patch')
| -rw-r--r-- | vdr-patch/vdr-menuorg-0.4.diff | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/vdr-patch/vdr-menuorg-0.4.diff b/vdr-patch/vdr-menuorg-0.4.diff index 61132ec..26862fa 100644 --- a/vdr-patch/vdr-menuorg-0.4.diff +++ b/vdr-patch/vdr-menuorg-0.4.diff @@ -1,7 +1,7 @@ diff -Nur vdr-1.5.18.orig/mainmenuitemsprovider.h vdr-1.5.18/mainmenuitemsprovider.h --- vdr-1.5.18.orig/mainmenuitemsprovider.h 1970-01-01 01:00:00.000000000 +0100 -+++ vdr-1.5.18/mainmenuitemsprovider.h 2008-03-22 20:55:19.000000000 +0100 -@@ -0,0 +1,58 @@ ++++ vdr-1.5.18/mainmenuitemsprovider.h 2008-03-23 01:54:07.000000000 +0100 +@@ -0,0 +1,59 @@ +/* + * vdr-menuorg - A plugin for the Linux Video Disk Recorder + * Copyright (c) 2007 - 2008 Tobias Grimm <vdr@e-tobi.net> @@ -52,6 +52,7 @@ diff -Nur vdr-1.5.18.orig/mainmenuitemsprovider.h vdr-1.5.18/mainmenuitemsprovid +{ + public: + virtual ~IMainMenuItemsProvider() {}; ++ virtual bool IsCustomMenuAvailable() = 0; + virtual MenuItemDefinitions* MainMenuItems() = 0; + virtual void EnterRootMenu() = 0; + virtual void EnterSubMenu(cOsdItem* item) = 0; @@ -62,7 +63,7 @@ diff -Nur vdr-1.5.18.orig/mainmenuitemsprovider.h vdr-1.5.18/mainmenuitemsprovid +#endif //__MAINMENUITEMSPROVIDER_H diff -Nur vdr-1.5.18.orig/menu.c vdr-1.5.18/menu.c --- vdr-1.5.18.orig/menu.c 2008-03-16 12:15:28.000000000 +0100 -+++ vdr-1.5.18/menu.c 2008-03-22 20:55:19.000000000 +0100 ++++ vdr-1.5.18/menu.c 2008-03-23 02:00:16.000000000 +0100 @@ -29,6 +29,7 @@ #include "timers.h" #include "transfer.h" @@ -164,7 +165,7 @@ diff -Nur vdr-1.5.18.orig/menu.c vdr-1.5.18/menu.c case kRed: if (!HadSubMenu) diff -Nur vdr-1.5.18.orig/menuorgpatch.h vdr-1.5.18/menuorgpatch.h --- vdr-1.5.18.orig/menuorgpatch.h 1970-01-01 01:00:00.000000000 +0100 -+++ vdr-1.5.18/menuorgpatch.h 2008-03-22 20:55:19.000000000 +0100 ++++ vdr-1.5.18/menuorgpatch.h 2008-03-23 01:53:29.000000000 +0100 @@ -0,0 +1,100 @@ +/* + * vdr-menuorg - A plugin for the Linux Video Disk Recorder @@ -216,7 +217,7 @@ diff -Nur vdr-1.5.18.orig/menuorgpatch.h vdr-1.5.18/menuorgpatch.h + public: + static bool IsCustomMenuAvailable() + { -+ return (MainMenuItemsProvider() != NULL); ++ return (MainMenuItemsProvider() != NULL) && (MainMenuItemsProvider()->IsCustomMenuAvailable()); + } + + static void EnterRootMenu() |