- Added patch for vdr-1.5.18.

1 files changed, 66 insertions, 0 deletions

diff --git a/patches/vdr-1.5.18-yaepg-core.diff b/patches/vdr-1.5.18-yaepg-core.diff
new file mode 100644
index 0000000..8182423
--- /dev/null
+++ b/patches/vdr-1.5.18-yaepg-core.diff
@@ -0,0 +1,66 @@
+diff -Nru vdr-1.5.18/device.h vdr-1.5.18-yaepg/device.h
+--- vdr-1.5.18/device.h	2008-02-23 05:13:04.000000000 -0800
++++ vdr-1.5.18-yaepg/device.h	2009-01-24 15:32:19.000000000 -0800
+@@ -242,12 +242,12 @@
+          ///< Direction (only the sign of Direction is evaluated, positive values
+          ///< switch to higher channel numbers).
+ private:
+-  eSetChannelResult SetChannel(const cChannel *Channel, bool LiveView);
+-         ///< Sets the device to the given channel (general setup).
+ protected:
+   virtual bool SetChannelDevice(const cChannel *Channel, bool LiveView);
+          ///< Sets the device to the given channel (actual physical setup).
+ public:
++  eSetChannelResult SetChannel(const cChannel *Channel, bool LiveView);
++         ///< Sets the device to the given channel (general setup).
+   static int CurrentChannel(void) { return primaryDevice ? currentChannel : 0; }
+          ///< Returns the number of the current channel on the primary device.
+   static void SetCurrentChannel(const cChannel *Channel) { currentChannel = Channel ? Channel->Number() : 0; }
+diff -Nru vdr-1.5.18/dvbosd.c vdr-1.5.18-yaepg/dvbosd.c
+--- vdr-1.5.18/dvbosd.c	2007-09-16 01:55:54.000000000 -0700
++++ vdr-1.5.18-yaepg/dvbosd.c	2009-01-24 15:32:19.000000000 -0800
+@@ -83,6 +83,10 @@
+         shown = false;
+         }
+      }
++     if (vidWin.bpp != 0) {
++         Cmd(OSD_SetWindow, 0, 5);
++         Cmd(OSD_Close);
++     }
+ }
+ 
+ eOsdError cDvbOsd::CanHandleAreas(const tArea *Areas, int NumAreas)
+@@ -198,6 +202,11 @@
+          Cmd(OSD_SetWindow, 0, i + 1);
+          Cmd(OSD_MoveWindow, 0, Left() + Bitmap->X0(), Top() + Bitmap->Y0());
+          }
++     if (vidWin.bpp != 0) {
++         Cmd(OSD_SetWindow, 0, 5);
++         Cmd(OSD_OpenRaw, vidWin.bpp, vidWin.x1, vidWin.y1,
++         vidWin.x2, vidWin.y2, (void *)0);
++     }
+      shown = true;
+      }
+ }
+diff -Nru vdr-1.5.18/osd.c vdr-1.5.18-yaepg/osd.c
+--- vdr-1.5.18/osd.c	2007-10-12 05:38:36.000000000 -0700
++++ vdr-1.5.18-yaepg/osd.c	2009-01-24 15:34:01.000000000 -0800
+@@ -730,6 +730,7 @@
+   width = height = 0;
+   level = Level;
+   active = false;
++  vidWin.bpp = 0;
+   for (int i = 0; i < Osds.Size(); i++) {
+       if (Osds[i]->level > level) {
+          Osds.Insert(this, i);
+diff -Nru vdr-1.5.18/osd.h vdr-1.5.18-yaepg/osd.h
+--- vdr-1.5.18/osd.h	2007-10-12 07:28:44.000000000 -0700
++++ vdr-1.5.18-yaepg/osd.h	2009-01-24 15:32:19.000000000 -0800
+@@ -400,6 +400,7 @@
+        ///< 7: vertical,   falling, upper
+   virtual void Flush(void);
+        ///< Actually commits all data to the OSD hardware.
++  tArea vidWin;
+   };
+ 
+ class cOsdProvider {