r4116 - in vdr/vdr/trunk/debian: . patches
Tobias Grimm
tiber-guest at alioth.debian.org
Mon Jan 22 01:41:50 CET 2007
Author: tiber-guest
Date: 2007-01-22 01:41:50 +0100 (Mon, 22 Jan 2007)
New Revision: 4116
Added:
vdr/vdr/trunk/debian/patches/opt-50_graphtft.dpatch
Modified:
vdr/vdr/trunk/debian/changelog
vdr/vdr/trunk/debian/patches/00list
vdr/vdr/trunk/debian/patches/patchtest
Log:
* Added opt-50_graphtft.dpatch, required by the graphtft plugin version 0.0.15
Modified: vdr/vdr/trunk/debian/changelog
===================================================================
--- vdr/vdr/trunk/debian/changelog 2007-01-21 15:52:00 UTC (rev 4115)
+++ vdr/vdr/trunk/debian/changelog 2007-01-22 00:41:50 UTC (rev 4116)
@@ -8,6 +8,7 @@
the console specified in KEYB_TTY on startup. Before this version, this
was the default behaviour when KEYB_TTY was specified. Now it's optional
and disabled by default.
+ * Added opt-50_graphtft.dpatch, required by the graphtft plugin version 0.0.15
-- Tobias Grimm <tg at e-tobi.net> Sat, 20 Jan 2007 01:38:33 +0100
Modified: vdr/vdr/trunk/debian/patches/00list
===================================================================
--- vdr/vdr/trunk/debian/patches/00list 2007-01-21 15:52:00 UTC (rev 4115)
+++ vdr/vdr/trunk/debian/patches/00list 2007-01-22 00:41:50 UTC (rev 4116)
@@ -74,3 +74,6 @@
# Patch to share one sat connection for several cards.
# opt-49_sharelnb
+
+# Patch required for the GraphTFT plugin
+# opt-50_graphtft
Added: vdr/vdr/trunk/debian/patches/opt-50_graphtft.dpatch
===================================================================
--- vdr/vdr/trunk/debian/patches/opt-50_graphtft.dpatch 2007-01-21 15:52:00 UTC (rev 4115)
+++ vdr/vdr/trunk/debian/patches/opt-50_graphtft.dpatch 2007-01-22 00:41:50 UTC (rev 4116)
@@ -0,0 +1,256 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## opt-50_graphtft.dpatch by Jörg Wendel (Horchi)
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Patch from teh Graphtft plugin version 0.0.15
+## DP: http://www.jwendel.de/vdr/
+
+ at DPATCH@
+diff -urNad vdr-1.4.5~/menu.c vdr-1.4.5/menu.c
+--- vdr-1.4.5~/menu.c 2007-01-21 12:47:14.000000000 +0100
++++ vdr-1.4.5/menu.c 2007-01-21 12:48:48.000000000 +0100
+@@ -226,6 +226,7 @@
+ public:
+ cMenuEditChannel(cChannel *Channel, bool New = false);
+ virtual eOSState ProcessKey(eKeys Key);
++ virtual eOsdMenuKind MenuKind() { return omEditChannel; }
+ };
+
+ cMenuEditChannel::cMenuEditChannel(cChannel *Channel, bool New)
+@@ -451,6 +452,7 @@
+ cMenuChannels(void);
+ ~cMenuChannels();
+ virtual eOSState ProcessKey(eKeys Key);
++ virtual eOsdMenuKind MenuKind() { return omChannels; }
+ };
+
+ cMenuChannels::cMenuChannels(void)
+@@ -949,6 +951,7 @@
+ virtual ~cMenuTimers();
+ virtual void Display(void);
+ virtual eOSState ProcessKey(eKeys Key);
++ virtual eOsdMenuKind MenuKind() { return omTimers; }
+ };
+
+ cMenuTimers::cMenuTimers(void)
+@@ -1479,6 +1482,7 @@
+ cMenuSchedule(void);
+ virtual ~cMenuSchedule();
+ virtual eOSState ProcessKey(eKeys Key);
++ virtual eOsdMenuKind MenuKind() { return omSchedule; }
+ };
+
+ cMenuSchedule::cMenuSchedule(void)
+@@ -1751,6 +1755,7 @@
+ cMenuCommands(const char *Title, cCommands *Commands, const char *Parameters = NULL);
+ virtual ~cMenuCommands();
+ virtual eOSState ProcessKey(eKeys Key);
++ virtual eOsdMenuKind MenuKind() { return omCommands; }
+ };
+
+ cMenuCommands::cMenuCommands(const char *Title, cCommands *Commands, const char *Parameters)
+@@ -1986,6 +1991,7 @@
+ cMenuRecording(const cRecording *Recording, bool WithButtons = false);
+ virtual void Display(void);
+ virtual eOSState ProcessKey(eKeys Key);
++ virtual eOsdMenuKind MenuKind() { return omRecording; }
+ };
+
+ cMenuRecording::cMenuRecording(const cRecording *Recording, bool WithButtons)
+@@ -3095,6 +3101,7 @@
+ public:
+ cMenuSetupPlugins(void);
+ virtual eOSState ProcessKey(eKeys Key);
++ virtual eOsdMenuKind MenuKind() { return omSetupPage; }
+ };
+
+ cMenuSetupPlugins::cMenuSetupPlugins(void)
+@@ -3148,6 +3155,7 @@
+ public:
+ cMenuSetup(void);
+ virtual eOSState ProcessKey(eKeys Key);
++ virtual eOsdMenuKind MenuKind() { return omSetup; }
+ };
+
+ cMenuSetup::cMenuSetup(void)
+diff -urNad vdr-1.4.5~/menu.h vdr-1.4.5/menu.h
+--- vdr-1.4.5~/menu.h 2007-01-21 12:47:14.000000000 +0100
++++ vdr-1.4.5/menu.h 2007-01-21 12:48:48.000000000 +0100
+@@ -30,6 +30,7 @@
+ void SetText(const char *Text);
+ virtual void Display(void);
+ virtual eOSState ProcessKey(eKeys Key);
++ virtual eOsdMenuKind MenuKind() { return omText; }
+ };
+
+ class cMenuEditTimer : public cOsdMenu {
+@@ -46,6 +47,7 @@
+ cMenuEditTimer(cTimer *Timer, bool New = false);
+ virtual ~cMenuEditTimer();
+ virtual eOSState ProcessKey(eKeys Key);
++ virtual eOsdMenuKind MenuKind() { return omTimerEdit; }
+ };
+
+ class cMenuEvent : public cOsdMenu {
+@@ -55,6 +57,7 @@
+ cMenuEvent(const cEvent *Event, bool CanSwitch = false, bool Buttons = false);
+ virtual void Display(void);
+ virtual eOSState ProcessKey(eKeys Key);
++ virtual eOsdMenuKind MenuKind() { return omEvent; }
+ };
+
+ class cMenuMain : public cOsdMenu {
+@@ -74,6 +77,7 @@
+ cMenuMain(eOSState State = osUnknown);
+ virtual eOSState ProcessKey(eKeys Key);
+ static cOsdObject *PluginOsdObject(void);
++ virtual eOsdMenuKind MenuKind() { return omMain; }
+ };
+
+ class cDisplayChannel : public cOsdObject {
+@@ -143,6 +147,7 @@
+ cMenuCam(cCiMenu *CiMenu);
+ virtual ~cMenuCam();
+ virtual eOSState ProcessKey(eKeys Key);
++ virtual eOsdMenuKind MenuKind() { return omCam; }
+ };
+
+ class cMenuCamEnquiry : public cOsdMenu {
+@@ -155,6 +160,7 @@
+ cMenuCamEnquiry(cCiEnquiry *CiEnquiry);
+ virtual ~cMenuCamEnquiry();
+ virtual eOSState ProcessKey(eKeys Key);
++ virtual eOsdMenuKind MenuKind() { return omCamEnquiry; }
+ };
+
+ cOsdObject *CamControl(void);
+@@ -182,6 +188,7 @@
+ cMenuRecordings(const char *Base = NULL, int Level = 0, bool OpenSubMenus = false);
+ ~cMenuRecordings();
+ virtual eOSState ProcessKey(eKeys Key);
++ virtual eOsdMenuKind MenuKind() { return omRecordings; }
+ };
+
+ class cRecordControl {
+diff -urNad vdr-1.4.5~/menuitems.h vdr-1.4.5/menuitems.h
+--- vdr-1.4.5~/menuitems.h 2007-01-21 12:47:13.000000000 +0100
++++ vdr-1.4.5/menuitems.h 2007-01-21 12:48:48.000000000 +0100
+@@ -179,6 +179,7 @@
+ cMenuSetupPage(void);
+ virtual eOSState ProcessKey(eKeys Key);
+ void SetPlugin(cPlugin *Plugin);
++ eOsdMenuKind MenuKind() { return omSetupPage; }
+ };
+
+ #endif //__MENUITEMS_H
+diff -urNad vdr-1.4.5~/osdbase.c vdr-1.4.5/osdbase.c
+--- vdr-1.4.5~/osdbase.c 2007-01-21 12:47:13.000000000 +0100
++++ vdr-1.4.5/osdbase.c 2007-01-21 12:48:48.000000000 +0100
+@@ -100,6 +100,7 @@
+ free(status);
+ displayMenu->Clear();
+ cStatus::MsgOsdClear();
++ cStatus::MsgOsdMenuDestroy();
+ if (!--displayMenuCount)
+ DELETENULL(displayMenu);
+ }
+@@ -195,6 +196,7 @@
+ displayMenu->SetMessage(mtStatus, NULL);
+ displayMenu->Clear();
+ cStatus::MsgOsdClear();
++ cStatus::MsgOsdMenuDisplay(MenuKind());
+ displayMenu->SetTabs(cols[0], cols[1], cols[2], cols[3], cols[4]);//XXX
+ displayMenu->SetTitle(title);
+ cStatus::MsgOsdTitle(title);
+@@ -510,6 +512,7 @@
+ eOSState state = subMenu->ProcessKey(Key);
+ if (state == osBack)
+ return CloseSubMenu();
++
+ return state;
+ }
+
+diff -urNad vdr-1.4.5~/osdbase.h vdr-1.4.5/osdbase.h
+--- vdr-1.4.5~/osdbase.h 2007-01-21 12:47:13.000000000 +0100
++++ vdr-1.4.5/osdbase.h 2007-01-21 12:48:48.000000000 +0100
+@@ -46,6 +46,30 @@
+ osUser10,
+ };
+
++enum eOsdMenuKind { omUnknown,
++ omMain,
++ omText,
++ omTimerEdit,
++ omEvent,
++ omCam,
++ omCamEnquiry,
++ omSetupPage,
++ omEditChannel,
++ omChannels,
++ omCommands,
++ omTimers,
++ omWhatsOn,
++ omWhatsOnElse = omWhatsOn,
++ omWhatsOnNow,
++ omWhatsOnNext,
++ omSchedule,
++ omRecording,
++ omRecordings,
++ omRenameRecording,
++ omSetup
++ };
++
++
+ class cOsdItem : public cListObject {
+ private:
+ char *text;
+@@ -127,6 +151,7 @@
+ void Ins(cOsdItem *Item, bool Current = false, cOsdItem *Before = NULL);
+ virtual void Display(void);
+ virtual eOSState ProcessKey(eKeys Key);
++ virtual eOsdMenuKind MenuKind() { return omUnknown; }
+ };
+
+ #endif //__OSDBASE_H
+diff -urNad vdr-1.4.5~/status.c vdr-1.4.5/status.c
+--- vdr-1.4.5~/status.c 2007-01-21 12:47:14.000000000 +0100
++++ vdr-1.4.5/status.c 2007-01-21 12:48:48.000000000 +0100
+@@ -158,3 +158,15 @@
+ for (cStatus *sm = statusMonitors.First(); sm; sm = statusMonitors.Next(sm))
+ sm->UserAction(key, Interact);
+ }
++
++void cStatus::MsgOsdMenuDisplay(eOsdMenuKind kind)
++{
++ for (cStatus *sm = statusMonitors.First(); sm; sm = statusMonitors.Next(sm))
++ sm->OsdMenuDisplay(kind);
++}
++
++void cStatus::MsgOsdMenuDestroy()
++{
++ for (cStatus *sm = statusMonitors.First(); sm; sm = statusMonitors.Next(sm))
++ sm->OsdMenuDestroy();
++}
+diff -urNad vdr-1.4.5~/status.h vdr-1.4.5/status.h
+--- vdr-1.4.5~/status.h 2007-01-21 12:47:14.000000000 +0100
++++ vdr-1.4.5/status.h 2007-01-21 12:50:29.000000000 +0100
+@@ -82,6 +82,10 @@
+ // Checks if a plugin is protected.
+ virtual void UserAction(const eKeys key, const cOsdObject* Interact) {} // PIN PATCH
+ // report user action
++ virtual void OsdMenuDisplay(eOsdMenuKind kind) {}
++ // report menu creation
++ virtual void OsdMenuDestroy() {}
++ // report menu destruvtion
+
+
+ public:
+@@ -110,6 +114,8 @@
+ static void MsgTimerCreation(cTimer* Timer, const cEvent *Event); // PIN PATCH
+ static bool MsgPluginProtected(cPlugin* Plugin); // PIN PATCH
+ static void MsgUserAction(const eKeys key, const cOsdObject* Interact); // PIN PATCH
++ static void MsgOsdMenuDisplay(const eOsdMenuKind kind);
++ static void MsgOsdMenuDestroy();
+ };
+
+ #endif //__STATUS_H
Modified: vdr/vdr/trunk/debian/patches/patchtest
===================================================================
--- vdr/vdr/trunk/debian/patches/patchtest 2007-01-21 15:52:00 UTC (rev 4115)
+++ vdr/vdr/trunk/debian/patches/patchtest 2007-01-22 00:41:50 UTC (rev 4116)
@@ -34,7 +34,8 @@
opt-46_dmh-dvd-archive \
opt-46-x_dmh-dvd-archive-debian \
opt-47_sourcecaps \
- opt-48_pin"
+ opt-48_pin \
+ opt-50_graphtft"
testpatch="$standard \
opt-20_liemikuutio \
opt-24_jumpplay \
@@ -54,7 +55,8 @@
opt-46_dmh-dvd-archive \
opt-46-x_dmh-dvd-archive-debian \
opt-48_pin \
- opt-49_sharelnb"
+ opt-49_sharelnb \
+ opt-50_graphtft"
mustfail_patch="XX_patchtest-patch-error"
mustfail_compile="XX_patchtest-compile-error"
More information about the pkg-vdr-dvb-changes
mailing list