Version 0.65vdr-0.65

- Modified LIRC interface to better handle repeat function.
- Faster OSD by first writing into a bitmap and then sending the entire bitmap
  to the DVB driver at once (requires the patch 'dvb.c.071.diff' to be applied
  against the version 0.71 DVB driver file 'dvb.c').
- When switching channels the channel is now immediately displayed, and the
  current/next information is shown as soon as it becomes available.
- No longer displaying the year in the 'Recordings' menu to saves space for the
  title.
- The 'Recordings' menu now displays a '*' to indicate new recordings.
- Added the description of the timers.conf file to the FORMATS file (thanks to
  Bastian Guse).
- Displaying as much as possible of the current/next info (dropping characters
  that would display only partially).
- In normal viewing mode the '0' key now toggles between the current and the
  previous channel.

1 files changed, 15 insertions, 17 deletions

diff --git a/dvbapi.h b/dvbapi.h
index 08ba4bf..b35f3fb 100644
--- a/dvbapi.h
+++ b/dvbapi.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbapi.h 1.16 2000/09/17 12:15:05 kls Exp $
+ * $Id: dvbapi.h 1.18 2000/10/03 11:26:10 kls Exp $
  */
 
 #ifndef __DVBAPI_H
@@ -20,6 +20,7 @@ typedef unsigned char __u8;
 #endif
 #include <stdio.h>
 #include <dvb.h>
+#include "dvbosd.h"
 
 // Overlay facilities
 #define MAXCLIPRECTS 100
@@ -30,22 +31,16 @@ typedef struct CRect {
 #define MenuLines   15
 #define MenuColumns 40
 
-enum eDvbColor { clrBackground,
-#ifndef DEBUG_OSD
-                 clrOBSOLETE, //FIXME apparently color '1' can't be used as FgColor with e.g. clrRed as BgColor???
-                 clrBlack,
-#else
-                 clrBlack = clrBackground,
-#endif
-                 clrRed,
-                 clrGreen,
-                 clrYellow,
-                 clrBlue,
-                 clrMagenta,
-                 clrCyan,
-                 clrWhite,
-               };
-                  
+class cResumeFile {
+private:
+  char *fileName;
+public:
+  cResumeFile(const char *FileName);
+  ~cResumeFile();
+  int Read(void);
+  bool Save(int Index);
+  };
+
 class cDvbApi {
 private:
   int videoDev;
@@ -106,6 +101,8 @@ private:
   enum { MaxColorPairs = 16 };
   int colorPairs[MaxColorPairs];
   void SetColor(eDvbColor colorFg, eDvbColor colorBg = clrBackground);
+#else
+  cDvbOsd *osd;
 #endif
   int cols, rows;
   void Cmd(OSD_Command cmd, int color = 0, int x0 = 0, int y0 = 0, int x1 = 0, int y1 = 0, const void *data = NULL);
@@ -116,6 +113,7 @@ public:
   void Fill(int x, int y, int w, int h, eDvbColor color = clrBackground);
   void ClrEol(int x, int y, eDvbColor color = clrBackground);
   void Text(int x, int y, const char *s, eDvbColor colorFg = clrWhite, eDvbColor colorBg = clrBackground);
+  void Flush(void);
 
   // Progress Display facilities