[vdr] Re: [ANNOUNCE] osdteletext 0.4

[Olaf Titz <olaf@bigred.inka.de>]

On my system this needs the following patch to compile (resolve
STL include conflicts by right include order - ugly, but the comment
in tools.h indicates this is OK):

--- osdteletext.c.orig	Mon Jul 12 20:08:11 2004
+++ osdteletext.c	Wed Aug  4 10:35:10 2004
@@ -9,20 +9,20 @@
  *                                                                         *
  ***************************************************************************/

-#include <vdr/plugin.h>
-#include <vdr/i18n.h>
-#include <vdr/keys.h>
-#include <vdr/config.h>
-
-#include <getopt.h>
-
 using namespace std;

+#include "txtrecv.h"
 #include "menu.h"
 #include "i18n.h"
 #include "display.h"
-#include "txtrecv.h"
 #include "setup.h"
+
+#include <vdr/plugin.h>
+#include <vdr/i18n.h>
+#include <vdr/keys.h>
+#include <vdr/config.h>
+
+#include <getopt.h>

 static const char *VERSION        = "0.4";
 static const char *DESCRIPTION    = "Displays teletext on the OSD";
--- txtbitmap.c.orig	Tue Jul  6 22:41:38 2004
+++ txtbitmap.c	Wed Aug  4 10:36:54 2004
@@ -8,12 +8,13 @@
  *                                                                         *
  ***************************************************************************/

-#include <time.h>
-
-#include "txtbitmap.h"
+#include "txtrecv.h"
 #include "menu.h"
+#include "txtbitmap.h"
 #include "txtfont.h"
 #include "setup.h"
+
+#include <time.h>

 cTxtBitmap::cTxtBitmap(int Width, int Height)
 :cBitmap(Width, Height, Display::Bpp())

=== end of patch ===

Btw. there is an useless osdteletext.c.orig file in the distribution.
Otherwise, great stuff... :-)

Olaf