Version 0.85vdr-0.85

- Added Norwegian language texts (thanks to Jørgen Tvedt).
- Increased the usleep value in cDvbOsd::Cmd() to 5000 in order to work on
  systems with the KURT/utime-patch (thanks to Guido Fiala).
- Changed the check whether the driver is loaded in runvdr to check for the
  'dvb' module (the last one loaded).
- Fixed repeat function with LIRC (thanks to Stefan Huelswitt).
- Increased the upper limit for the symbol rate to 30000 (thanks to Ulrich
  Röder).
- Made the position of the channel display configurable (thanks to Stefan
  Huelswitt).
- Made the width and height of the OSD configurable (thanks to Stefan Huelswitt).
- DiSEqC support can now be generally enabled/disabled in the Setup menu. This
  may be necessary if your multiswitch gets irritated by the default DiSEqC
  codes '0' (thanks to Markus Lang).
- Fixed replaying in case there is no index file.
- Fixed jumping to an editing mark when replay has been paused.
- Avoiding unnecessary code execution in the replay progress display (thanks
  to Guido Fiala).
- When entering time values the digits that still have to be entered are now
  shown as '-' (as in "1-:--").
- When setting an editing mark while the progress display is not active, the
  display will now be turned on for a short while to indicate the successful
  setting of the mark.
- Updated 'channels.conf' for Premiere World (thanks to Helmut Schächner).
  Check your timers if you use this channels.conf file, since the sequence of
  several PW channels has been changed.
- Changed the color of "Info" messages to "black on green" and that of the
  confirmation messages (like "Delete...") to "black on yellow".
- Fixed display with DEBUG_OSD (it still crashes sometimes, esp. when replaying,
  but I can't seem to find what causes this... any ideas anybody?).
- Avoiding audio/video distortions in 'Transfer Mode' by no longer actually
  tuning the primary interface (which can't receive this channel, anyway).
  Apparently the driver gets irritated when the channel is switched and a
  replay session is started immediately after that.
- Increased timeout until reporting "video data stream broken" when recording.
- Explicitly switching back to the previously active channel after ending a
  replay session (to have it shown correctly in case it was in 'Transfer Mode').

1 files changed, 62 insertions, 22 deletions

diff --git a/dvbosd.h b/dvbosd.h
index eefdb62..5039a91 100644
--- a/dvbosd.h
+++ b/dvbosd.h
@@ -4,35 +4,26 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbosd.h 1.5 2000/12/09 10:32:47 kls Exp $
+ * $Id: dvbosd.h 1.8 2001/07/28 16:22:32 kls Exp $
  */
 
 #ifndef __DVBOSD_H
 #define __DVBOSD_H
 
-// FIXME: these should be defined in ../DVB/driver/dvb.h!!!
-typedef unsigned int __u32;
-typedef unsigned short __u16;
-typedef unsigned char __u8;
-
 #if defined(DEBUG_OSD) || defined(REMOTE_KBD)
 #include <ncurses.h>
 #endif
+#include <ost/osd.h>
 #include <stdio.h>
-#include <dvb.h>
 #include "font.h"
 
-enum eDvbColor { 
-#ifndef DEBUG_OSD
-  clrTransparent,
-#endif
-  clrBackground,
+#define MAXNUMCOLORS 16
+
+enum eDvbColor {
 #ifdef DEBUG_OSD
+  clrBackground,
   clrTransparent = clrBackground,
   clrBlack = clrBackground,
-#else
-  clrBlack,
-#endif
   clrRed,
   clrGreen,
   clrYellow,
@@ -40,39 +31,88 @@ enum eDvbColor {
   clrMagenta,
   clrCyan,
   clrWhite,
+#else
+  clrTransparent = 0x00000000,
+  clrBackground  = 0x7F000000, // 50% gray
+  clrBlack       = 0xFF000000,
+  clrRed         = 0xFF1414FC,
+  clrGreen       = 0xFF24FC24,
+  clrYellow      = 0xFF24C0FC,
+  clrMagenta     = 0xFFFC00B0,
+  clrBlue        = 0xFFFC0000,
+  clrCyan        = 0xFFFCFC00,
+  clrWhite       = 0xFFFCFCFC,
+#endif
+  };
+
+class cPalette {
+private:
+  eDvbColor color[MAXNUMCOLORS];
+  int maxColors, numColors;
+  bool used[MAXNUMCOLORS];
+  bool fetched[MAXNUMCOLORS];
+  bool full;
+protected:
+  typedef unsigned char tIndexes[MAXNUMCOLORS];
+public:
+  cPalette(int Bpp);
+  int Index(eDvbColor Color);
+  void Reset(void);
+  const eDvbColor *Colors(int &FirstColor, int &LastColor);
+  void Take(const cPalette &Palette, tIndexes *Indexes = NULL);
   };
 
-class cBitmap {
+class cBitmap : public cPalette {
 private:
   cFont *font;
   eDvbFont fontType;
+  void SetIndex(int x, int y, char Index);
+  char *bitmap;
+  bool clearWithBackground;
 protected:
   int width, height;
-  char *bitmap;
   int dirtyX1, dirtyY1, dirtyX2, dirtyY2;
-  void Clean(void);
 public:
-  cBitmap(int Width, int Height);
+  cBitmap(int Width, int Height, int Bpp, bool ClearWithBackground = true);
   virtual ~cBitmap();
   eDvbFont SetFont(eDvbFont Font);
-  bool Dirty(void);
+  bool Dirty(int &x1, int &y1, int &x2, int &y2);
   void SetPixel(int x, int y, eDvbColor Color);
   void SetBitmap(int x, int y, const cBitmap &Bitmap);
+  int Width(void) { return width; }
   int Width(unsigned char c);
   int Width(const char *s);
   void Text(int x, int y, const char *s, eDvbColor ColorFg = clrWhite, eDvbColor ColorBg = clrBackground);
   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);
   };
 
-class cDvbOsd : public cBitmap {
+#define MAXNUMWINDOWS 7 // OSD windows are counted 1...7
+
+class cWindow;
+
+class cDvbOsd {
 private:
   int videoDev;
+  int numWindows;
+  int x0, y0;
+  cWindow *window[MAXNUMWINDOWS];
   void Cmd(OSD_Command cmd, int color = 0, int x0 = 0, int y0 = 0, int x1 = 0, int y1 = 0, const void *data = NULL);
+  cWindow *GetWindow(int x, int y);
 public:
-  cDvbOsd(int VideoDev, int x1, int y1, int x2, int y2, int Bpp);
+  cDvbOsd(int VideoDev, int x, int y, int w = -1, int h = -1, int Bpp = -1);
   ~cDvbOsd();
+  bool Create(int x, int y, int w, int h, int Bpp, bool ClearWithBackground = true, eDvbColor Color0 = clrTransparent, eDvbColor Color1 = clrTransparent, eDvbColor Color2 = clrTransparent, eDvbColor Color3 = clrTransparent);
   void Flush(void);
+  void Clear(void);
+  void Fill(int x1, int y1, int x2, int y2, eDvbColor Color);
+  void SetBitmap(int x, int y, const cBitmap &Bitmap);
+  int Width(unsigned char c);
+  int Width(const char *s);
+  eDvbFont SetFont(eDvbFont Font);
+  void Text(int x, int y, const char *s, eDvbColor ColorFg = clrWhite, eDvbColor ColorBg = clrBackground);
   };
 
 #endif //__DVBOSD_H