Fixed display with DEBUG_OSD

HISTORY

@@ -601,3 +601,5 @@ Video Disk Recorder Revision History
   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?).

dvbosd.h

@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbosd.h 1.7 2001/07/22 11:49:35 kls Exp $
+ * $Id: dvbosd.h 1.8 2001/07/28 16:22:32 kls Exp $
  */
 
 #ifndef __DVBOSD_H
@@ -20,16 +20,21 @@
 #define MAXNUMCOLORS 16
 
 enum eDvbColor {
-#ifndef DEBUG_OSD
-  clrTransparent = 0x00000000,
-#endif
-  clrBackground  = 0x7F000000, // 50% gray
 #ifdef DEBUG_OSD
+  clrBackground,
   clrTransparent = clrBackground,
   clrBlack = clrBackground,
+  clrRed,
+  clrGreen,
+  clrYellow,
+  clrBlue,
+  clrMagenta,
+  clrCyan,
+  clrWhite,
 #else
+  clrTransparent = 0x00000000,
+  clrBackground  = 0x7F000000, // 50% gray
   clrBlack       = 0xFF000000,
-#endif
   clrRed         = 0xFF1414FC,
   clrGreen       = 0xFF24FC24,
   clrYellow      = 0xFF24C0FC,
@@ -37,6 +42,7 @@ enum eDvbColor {
   clrBlue        = 0xFFFC0000,
   clrCyan        = 0xFFFCFC00,
   clrWhite       = 0xFFFCFCFC,
+#endif
   };
 
 class cPalette {

menu.c

@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.87 2001/07/28 14:03:39 kls Exp $
+ * $Id: menu.c 1.88 2001/07/28 16:17:28 kls Exp $
  */
 
 #include "menu.h"
@@ -2190,9 +2190,8 @@ void cReplayControl::Show(int Seconds)
      Interface->Open(Setup.OSDwidth, -3);
      needsFastResponse = visible = true;
      shown = ShowProgress(true);
-     if (Seconds > 0) {
+     if (Seconds > 0)
         timeoutShow = time(NULL) + Seconds;
-        }
      }
 }
 
@@ -2213,6 +2212,7 @@ bool cReplayControl::ShowProgress(bool Initial)
         Interface->Clear();
         if (title)
            Interface->Write(0, 0, title);
+        lastCurrent = lastTotal = -1;
         }
      if (Total != lastTotal) {
         Interface->Write(-7, 2, IndexToHMSF(Total));