2007-07-02: Version 0.0.5v0.0.5

- Reworked font handling in menu OSD a little bit to (hopefully) fix crashes with plugins that patch fonts.
- Updated Nederlands translation (Provided by dorpsgek @vdr-portal.de).
- Don't make info area in mainmenu too small (Requested by vdrchuck @vdr-portal.de).
- Save and restore TTF FixedFont (Reported by zulu @vdr-portal.de).
- Updated Italian translation (Provided by Gringo).
- Updated French translation (Provided by Pat @vdr-portal.de).

1 files changed, 6 insertions, 5 deletions

diff --git a/texteffects.h b/texteffects.h
index 5f1d61d..0eda97e 100644
--- a/texteffects.h
+++ b/texteffects.h
@@ -25,7 +25,7 @@
 #define TE_WAKEUP ;
 #define TE_MARQUEE(osd, id, x...) osd->DrawText(x)
 #define TE_BLINK(osd, id, x...) osd->DrawText(x)
-#define TE_TITLE(osd, id, s, Font, Width, skin) osd->DrawTitle(s)
+#define TE_TITLE(osd, id, s, Width, skin) osd->DrawTitle(s)
 
 #else // !DISABLE_ANIMATED_TEXT
 #include <vdr/thread.h>
@@ -65,6 +65,7 @@ private:
     std::string strText;
     int x, y, Width, Height;
     tColor ColorFg, ColorBg;
+    int FontId;
     const cFont *Font;
     int Alignment;
     cSkinEnigmaOsd *Skin;
@@ -72,8 +73,8 @@ private:
   public:
     tEffect(void) : nAction(0), nOffset(0), nDirection(0),
                     nNextUpdate(0), x(0), y(0), Width(0), Height(0),
-                    ColorFg(0), ColorBg(0), Font(NULL), Alignment(taDefault),
-                    Skin(NULL)
+                    ColorFg(0), ColorBg(0), FontId(fontOsd + 1), Font(NULL),
+                    Alignment(taDefault), Skin(NULL)
     {};
   };
 
@@ -115,8 +116,8 @@ public:
   void ResetText(int i, tColor ColorFg = 0, tColor ColorBg = 0, bool fDraw = true);
   void PauseEffects(int y = 0);
   void UpdateTextWidth(int i, int Width);
-  int DrawAnimatedTitle(int o_id, int action, const char *s, const cFont *Font, int Width, cSkinEnigmaOsd *skin);
-  int DrawAnimatedText(int o_id, int action, int x, int y, const char *s, tColor ColorFg, tColor ColorBg, const cFont *Font, int Width = 0, int Height = 0, int Alignment = taDefault);
+  int DrawAnimatedTitle(int o_id, int action, const char *s, int Width, cSkinEnigmaOsd *skin);
+  int DrawAnimatedText(int o_id, int action, int x, int y, const char *s, tColor ColorFg, tColor ColorBg, int FontId, int Width = 0, int Height = 0, int Alignment = taDefault);
 
   void UpdateLock(void)
   {