From 3fc29659759abb10154b78f9e3568407e523e1fc Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 8 Feb 2004 18:00:00 +0100
Subject: Version 1.3.4 - Fixed handling language codes in case there is no
 audio or Dolby PID. - Fixed handling CA ids (was broken in 1.3.3). - Fixed
 the SVDRP command 'STAT DISK' to avoid a 'division by 0' in case the   disk
 is full (thanks to Jens Rosenboom). - Fixed handling bitmap indexes for 256
 color mode (thanks to Andreas Regel). - Now handling "linked services" (based
 on the 'autopid' patch from Andreas   Schultz). Linked channels are detected
 and added to 'channels.conf', but   currently they are not yet presented to
 the user other than being in the   normal channel list (this will come
 later). - Preliminary fix for the "Unknown picture type error" (thanks to
 Sascha   Volkenandt for his support in debugging this one). This may slow
 down switching   between channels on different transponders for now, but a
 better solution will   come later. - Fixed the validity check for channel
 IDs, because some providers use TIDs with   value 0 (thanks to Thomas
 Bergwinkl). - Enabled switching to a channel even if it has no Vpid or Apid
 set, because these   might be automatically set when tuned to that
 transponder. - No longer closing the Channels menu after trying to switch to
 a channel that   is currently not available. - Removed the now obsolete
 CaCaps stuff. The Setup/CICAM menu now displays the   actual CAM type as
 reported by the CAM. The 'ca.conf' file has been stripped   down to the
 values 0..4.

---
 osdbase.h | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'osdbase.h')

diff --git a/osdbase.h b/osdbase.h
index ce4bc90..3277d82 100644
--- a/osdbase.h
+++ b/osdbase.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osdbase.h 1.8 2004/01/04 14:22:43 kls Exp $
+ * $Id: osdbase.h 1.9 2004/01/31 10:28:49 kls Exp $
  */
 
 #ifndef __OSDBASE_H
@@ -49,7 +49,7 @@ private:
   bool fetched[MAXNUMCOLORS];
   bool full;
 protected:
-  typedef unsigned char tIndexes[MAXNUMCOLORS];
+  typedef u_char tIndexes[MAXNUMCOLORS];
 public:
   cPalette(int Bpp);
   int Index(eDvbColor Color);
@@ -75,7 +75,7 @@ class cBitmap : public cPalette {
 private:
   const cFont *font;
   eDvbFont fontType;
-  char *bitmap;
+  u_char *bitmap;
   bool clearWithBackground;
 protected:
   int width, height;
@@ -86,7 +86,7 @@ public:
   bool ClearWithBackground(void) { return clearWithBackground; }
   eDvbFont SetFont(eDvbFont Font);
   bool Dirty(int &x1, int &y1, int &x2, int &y2);
-  void SetIndex(int x, int y, char Index);
+  void SetIndex(int x, int y, u_char Index);
   void SetPixel(int x, int y, eDvbColor Color);
   void SetBitmap(int x, int y, const cBitmap &Bitmap);
   int Width(void) { return width; }
@@ -97,7 +97,7 @@ public:
   void Fill(int x1, int y1, int x2, int y2, eDvbColor Color);
   void Clean(void);
   void Clear(void);
-  const char *Data(int x, int y);
+  const u_char *Data(int x, int y);
   };
 
 #define MAXNUMWINDOWS 7 // OSD windows are counted 1...7
@@ -122,7 +122,7 @@ public:
   void Fill(int x1, int y1, int x2, int y2, eDvbColor Color);
   void SetBitmap(int x, int y, const cBitmap &Bitmap);
   void Text(int x, int y, const char *s, eDvbColor ColorFg = clrWhite, eDvbColor ColorBg = clrBackground);
-  const char *Data(int x, int y);
+  const u_char *Data(int x, int y);
   };
 
 typedef int tWindowHandle;
-- 
cgit v1.2.3