diff options
| author | svntobi <svntobi@cd0d6b48-d4f9-0310-940f-ab8c4eb44d3f> | 2007-07-26 21:35:48 +0000 |
|---|---|---|
| committer | svntobi <svntobi@cd0d6b48-d4f9-0310-940f-ab8c4eb44d3f> | 2007-07-26 21:35:48 +0000 |
| commit | c2c62c9d3b62535835ffb7aa26d21c9e54752164 (patch) | |
| tree | 384b6e8650a70255c6b28d86663f8f4415e1a7fa | |
| parent | c877dce33bb7d4b4ed69d2cd1bd7d9043463303f (diff) | |
| download | vdr-plugin-menuorg-c2c62c9d3b62535835ffb7aa26d21c9e54752164.tar.gz vdr-plugin-menuorg-c2c62c9d3b62535835ffb7aa26d21c9e54752164.tar.bz2 | |
check for osdItem != NULL and plugin mein menu entry != NULL
git-svn-id: file:///home/tobias/sandbox/vdr/--/vdr-pkg/vdr-pkg/submenu/trunk@5643 cd0d6b48-d4f9-0310-940f-ab8c4eb44d3f
| -rwxr-xr-x | vdr-patch/opt-37_submenu.dpatch | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/vdr-patch/opt-37_submenu.dpatch b/vdr-patch/opt-37_submenu.dpatch index 60b6986..92335ea 100755 --- a/vdr-patch/opt-37_submenu.dpatch +++ b/vdr-patch/opt-37_submenu.dpatch @@ -4,8 +4,8 @@ @DPATCH@ diff -urNad vdr-1.4.7~/Makefile vdr-1.4.7/Makefile ---- vdr-1.4.7~/Makefile 2007-07-25 01:11:25.000000000 +0200 -+++ vdr-1.4.7/Makefile 2007-07-25 01:11:25.000000000 +0200 +--- vdr-1.4.7~/Makefile 2007-07-26 23:27:29.000000000 +0200 ++++ vdr-1.4.7/Makefile 2007-07-26 23:27:30.000000000 +0200 @@ -38,7 +38,7 @@ lirc.o menu.o menuitems.o nit.o osdbase.o osd.o pat.o player.o plugin.o rcu.o\ receiver.o recorder.o recording.o remote.o remux.o ringbuffer.o sdt.o sections.o\ @@ -16,8 +16,8 @@ diff -urNad vdr-1.4.7~/Makefile vdr-1.4.7/Makefile OBJS += osdcontroller.o rcontroller.o dvbsub.o vdrttxtsubshooks.o diff -urNad vdr-1.4.7~/menu.c vdr-1.4.7/menu.c ---- vdr-1.4.7~/menu.c 2007-07-25 01:11:25.000000000 +0200 -+++ vdr-1.4.7/menu.c 2007-07-25 01:22:06.000000000 +0200 +--- vdr-1.4.7~/menu.c 2007-07-26 23:27:29.000000000 +0200 ++++ vdr-1.4.7/menu.c 2007-07-26 23:30:16.000000000 +0200 @@ -31,6 +31,7 @@ #include "vdrttxtsubshooks.h" #include "dvbsub.h" @@ -26,7 +26,7 @@ diff -urNad vdr-1.4.7~/menu.c vdr-1.4.7/menu.c #define MAXWAIT4EPGINFO 3 // seconds #define MODETIMEOUT 3 // seconds -@@ -3084,6 +3085,25 @@ +@@ -3084,6 +3085,29 @@ Clear(); SetTitle("VDR"); SetHasHotkeys(); @@ -40,11 +40,15 @@ diff -urNad vdr-1.4.7~/menu.c vdr-1.4.7/menu.c + for (i = menuItems->begin(); i != menuItems->end(); i++) { + if ((*i)->IsCustomMenuItem()) { + cOsdItem* osdItem = (*i)->CustomMenuItem(); -+ osdItem->SetText(hk(osdItem->Text())); -+ Add(osdItem); ++ if (osdItem) { ++ osdItem->SetText(hk(osdItem->Text())); ++ Add(osdItem); ++ } + } + else if ((*i)->IsPluginMenuItem()) { -+ Add(new cMenuPluginItem(hk((*i)->PluginMenuEntry()), (*i)->PluginIndex())); ++ const char *item = (*i)->PluginMenuEntry(); ++ if (item) ++ Add(new cMenuPluginItem(hk(item), (*i)->PluginIndex())); + } + } + } @@ -52,7 +56,7 @@ diff -urNad vdr-1.4.7~/menu.c vdr-1.4.7/menu.c // Basic menu items: -@@ -3111,6 +3131,8 @@ +@@ -3111,6 +3135,8 @@ if (Commands.Count()) Add(new cOsdItem(hk(tr("Commands")), osCommands)); @@ -61,7 +65,7 @@ diff -urNad vdr-1.4.7~/menu.c vdr-1.4.7/menu.c Update(true); Display(); -@@ -3238,6 +3260,35 @@ +@@ -3238,6 +3264,35 @@ state = osEnd; } break; @@ -99,7 +103,7 @@ diff -urNad vdr-1.4.7~/menu.c vdr-1.4.7/menu.c case kRed: if (!HadSubMenu) diff -urNad vdr-1.4.7~/submenupatch.c vdr-1.4.7/submenupatch.c --- vdr-1.4.7~/submenupatch.c 1970-01-01 01:00:00.000000000 +0100 -+++ vdr-1.4.7/submenupatch.c 2007-07-25 01:11:25.000000000 +0200 ++++ vdr-1.4.7/submenupatch.c 2007-07-26 23:27:30.000000000 +0200 @@ -0,0 +1,75 @@ +/* + * vdr-submenu - A plugin for the Linux Video Disk Recorder @@ -178,7 +182,7 @@ diff -urNad vdr-1.4.7~/submenupatch.c vdr-1.4.7/submenupatch.c +}; diff -urNad vdr-1.4.7~/submenupatch.h vdr-1.4.7/submenupatch.h --- vdr-1.4.7~/submenupatch.h 1970-01-01 01:00:00.000000000 +0100 -+++ vdr-1.4.7/submenupatch.h 2007-07-25 01:11:25.000000000 +0200 ++++ vdr-1.4.7/submenupatch.h 2007-07-26 23:27:30.000000000 +0200 @@ -0,0 +1,60 @@ +/* + * vdr-submenu - A plugin for the Linux Video Disk Recorder |