[vdr] Problem: subtitles-0.3.3 patch & vdr-1.3.11

[Marko Moisio <mmoisio5@welho.com>]

Hello all,

I was able to install subtitles-0.3.3 plugin to vdr-1.3.10, but I got the
following error message with vdr-1.3.11

Any ideas?

- Marko

###
kcld27 <18:01> <~/tmp/vdr-1.3.11>:  patch -p1 < DVBsubs.patch
patching file Makefile
patching file dvbplayer.c
Hunk #4 succeeded at 567 (offset 4 lines).
patching file menu.c
Hunk #2 succeeded at 2769 (offset -3 lines).
patching file osd.c
Hunk #2 succeeded at 575 (offset 21 lines).
Hunk #4 FAILED at 693.
1 out of 4 hunks FAILED -- saving rejects to file osd.c.rej
patching file osd.h
Hunk #1 FAILED at 205.
Hunk #2 succeeded at 328 (offset 13 lines).
1 out of 2 hunks FAILED -- saving rejects to file osd.h.rej
patching file recorder.c
patching file recorder.h
patching file remux.c
patching file remux.h
patching file remux.h
Exit 1
kcld27 <18:02> <~/tmp/vdr-1.3.11>: 
kcld27 <18:11> <~/tmp/vdr-1.3.11>: more osd.c.rej
***************
*** 690,697 ****
    osdProvider = NULL;
  }
   
- cOsd *cOsdProvider::NewOsd(int Left, int Top)
  {
    if (osdProvider)
       return osdProvider->CreateOsd(Left, Top);
    esyslog("ERROR: no OSD provider available - using dummy OSD!");
--- 693,704 ----
   osdProvider = NULL;
  }
   
+ cOsd *cOsdProvider::NewOsd(int Left, int Top, bool dontHide)
  {
+   if (!dontHide)
+      NonInteractiveOsdPatch::OsdController.Hide();
+   cOsd::niosd = dontHide;
+
    if (osdProvider)
       return osdProvider->CreateOsd(Left, Top);
    esyslog("ERROR: no OSD provider available - using dummy OSD!");
kcld27 <18:11> <~/tmp/vdr-1.3.11>: 
kcld27 <18:11> <~/tmp/vdr-1.3.11>: more osd.h.rej
***************
*** 205,210 ****
    int numBitmaps;
    int left, top, width, height;
  public:
    cOsd(int Left, int Top);
         ///< Initializes the OSD with the given coordinates.
         ///< By default it is assumed that the full area will be able to display
--- 205,211 ----
    int numBitmaps;
    int left, top, width, height;
  public:
+   static bool niosd;
    cOsd(int Left, int Top);
         ///< Initializes the OSD with the given coordinates.
         ///< By default it is assumed that the full area will be able to display
#########
kcld27 <18:12> <~/tmp/vdr-1.3.11>:  uname -a
Linux kcld27 2.4.18-14 #1 Wed Sep 4 13:35:50 EDT 2002 i686 i686 i386 GNU/Linux
kcld27 <18:24> <~/tmp/vdr-1.3.11>: more /etc/redhat-release
Pink Tie Linux release 8.0 (Psyche)

--