From d5208be84b6d604051f04b024ad65c004006fc50 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <vdr@tvdr.de>
Date: Sat, 13 Jul 2002 10:24:28 +0200
Subject: [PATCH] Added direct access to the index data of cPalette (needed for
 displaying SPUs)

---
 CONTRIBUTORS | 1 +
 HISTORY      | 5 +++++
 config.h     | 4 ++--
 osdbase.h    | 5 +++--
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index f886624e..c281388f 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -155,6 +155,7 @@ Andreas Schultz <aschultz@warp10.net>
  for fixing a crash in case there is no 'epg.data' at program start
  for fixing a bug in the EPG bugfix mechanism if the extended description is shorter
  than 3 characters
+ for adding direct access to the index data of cPalette (needed for displaying SPUs)
 
 Aaron Holtzman
  for writing 'ac3dec'
diff --git a/HISTORY b/HISTORY
index 4b4eee98..37c49f74 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1359,3 +1359,8 @@ Video Disk Recorder Revision History
 - The following limitations apply to this version:
   + The '-a' option (for Dolby Digital audio) doesn't work yet.
   + Switching between different language tracks doesn't work yet.
+
+2002-07-13: Version 1.1.5
+
+- Added direct access to the index data of cPalette (needed for displaying SPUs,
+  thanks to Andreas Schultz).
diff --git a/config.h b/config.h
index 601b6fdd..f10b83d4 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.119 2002/06/16 14:49:52 kls Exp $
+ * $Id: config.h 1.120 2002/07/13 09:46:59 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -19,7 +19,7 @@
 #include "eit.h"
 #include "tools.h"
 
-#define VDRVERSION "1.1.4"
+#define VDRVERSION "1.1.5"
 
 #define MAXPRIORITY 99
 #define MAXLIFETIME 99
diff --git a/osdbase.h b/osdbase.h
index a20dfc46..a73b1c47 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.2 2002/05/18 12:38:17 kls Exp $
+ * $Id: osdbase.h 1.3 2002/07/13 10:16:18 kls Exp $
  */
 
 #ifndef __OSDBASE_H
@@ -52,6 +52,7 @@ protected:
   typedef unsigned char tIndexes[MAXNUMCOLORS];
 public:
   cPalette(int Bpp);
+  void SetColor(int Index, eDvbColor Color);
   int Index(eDvbColor Color);
   void Reset(void);
   const eDvbColor *Colors(int &FirstColor, int &LastColor);
@@ -62,7 +63,6 @@ class cBitmap : public cPalette {
 private:
   cFont *font;
   eDvbFont fontType;
-  void SetIndex(int x, int y, char Index);
   char *bitmap;
   bool clearWithBackground;
 protected:
@@ -74,6 +74,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 SetPixel(int x, int y, eDvbColor Color);
   void SetBitmap(int x, int y, const cBitmap &Bitmap);
   int Width(void) { return width; }