diff options
| author | Ulrich Eckhardt <vdr@uli-eckhardt.de> | 2017-04-23 16:51:05 +0200 |
|---|---|---|
| committer | Ulrich Eckhardt <vdr@uli-eckhardt.de> | 2017-04-23 16:51:05 +0200 |
| commit | b856b0d5f6a3ea5cd52640bb3e200e5c7045b704 (patch) | |
| tree | 9eabb4a84caaea3c5fcab0a28b828cad662f7194 | |
| parent | 3c771e39aaf7b2c4b954d8eb5db1c56bfaa99950 (diff) | |
| download | vdr-plugin-menuorg-b856b0d5f6a3ea5cd52640bb3e200e5c7045b704.tar.gz vdr-plugin-menuorg-b856b0d5f6a3ea5cd52640bb3e200e5c7045b704.tar.bz2 | |
Updated VDR Patch for 2.3.x
| -rw-r--r-- | vdr-patch/vdr-menuorg-2.3.x.diff (renamed from vdr-patch/vdr-menuorg-0.4.2.diff) | 33 |
1 files changed, 19 insertions, 14 deletions
diff --git a/vdr-patch/vdr-menuorg-0.4.2.diff b/vdr-patch/vdr-menuorg-2.3.x.diff index b24b848..5eeb0fa 100644 --- a/vdr-patch/vdr-menuorg-0.4.2.diff +++ b/vdr-patch/vdr-menuorg-2.3.x.diff @@ -1,6 +1,8 @@ -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-25 21:17:28.000000000 +0100 +diff --git a/mainmenuitemsprovider.h b/mainmenuitemsprovider.h +new file mode 100644 +index 0000000..aaba5e9 +--- /dev/null ++++ b/mainmenuitemsprovider.h @@ -0,0 +1,60 @@ +/* + * vdr-menuorg - A plugin for the Linux Video Disk Recorder @@ -62,10 +64,11 @@ 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-25 21:17:28.000000000 +0100 -@@ -29,6 +29,7 @@ +diff --git a/menu.c b/menu.c +index 233b025..396bbea 100644 +--- a/menu.c ++++ b/menu.c +@@ -32,6 +32,7 @@ #include "timers.h" #include "transfer.h" #include "videodir.h" @@ -73,7 +76,7 @@ diff -Nur vdr-1.5.18.orig/menu.c vdr-1.5.18/menu.c #define MAXWAIT4EPGINFO 3 // seconds #define MODETIMEOUT 3 // seconds -@@ -2969,6 +2970,9 @@ +@@ -4289,6 +4290,9 @@ cMenuMain::cMenuMain(eOSState State, bool OpenSubMenus) cancelEditingItem = NULL; stopRecordingItem = NULL; recordControlsState = 0; @@ -83,7 +86,7 @@ diff -Nur vdr-1.5.18.orig/menu.c vdr-1.5.18/menu.c Set(); // Initial submenus: -@@ -2997,6 +3001,29 @@ +@@ -4317,6 +4321,29 @@ void cMenuMain::Set(void) SetTitle("VDR"); SetHasHotkeys(); @@ -113,7 +116,7 @@ diff -Nur vdr-1.5.18.orig/menu.c vdr-1.5.18/menu.c // Basic menu items: Add(new cOsdItem(hk(tr("Schedule")), osSchedule)); -@@ -3023,6 +3050,8 @@ +@@ -4343,6 +4370,8 @@ void cMenuMain::Set(void) if (Commands.Count()) Add(new cOsdItem(hk(tr("Commands")), osCommands)); @@ -122,7 +125,7 @@ diff -Nur vdr-1.5.18.orig/menu.c vdr-1.5.18/menu.c Update(true); Display(); -@@ -3135,6 +3164,41 @@ +@@ -4447,6 +4476,41 @@ eOSState cMenuMain::ProcessKey(eKeys Key) state = osEnd; } break; @@ -164,9 +167,11 @@ diff -Nur vdr-1.5.18.orig/menu.c vdr-1.5.18/menu.c default: switch (Key) { case kRecord: 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-25 21:17:28.000000000 +0100 +diff --git a/menuorgpatch.h b/menuorgpatch.h +new file mode 100644 +index 0000000..37fa0a7 +--- /dev/null ++++ b/menuorgpatch.h @@ -0,0 +1,100 @@ +/* + * vdr-menuorg - A plugin for the Linux Video Disk Recorder |