frodovdr/vdr
1
0
Fork 0
mirror of https://github.com/VDR4Arch/vdr.git synced 2023-10-10 13:36:52 +02:00
Code Issues Releases Wiki Activity

Fixed display with DEBUG_OSD

Browse Source
This commit is contained in:
Klaus Schmidinger 2001-07-28 16:32:40 +02:00
parent 97ac615490
commit 5d415c08d0
3 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
HISTORY
View File

@ -601,3 +601,5 @@ Video Disk Recorder Revision History
several PW channels has been changed. several PW channels has been changed.
- Changed the color of "Info" messages to "black on green" and that of the - Changed the color of "Info" messages to "black on green" and that of the
confirmation messages (like "Delete...") to "black on yellow". 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?).

18
dvbosd.h
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and * See the main source file 'vdr.c' for copyright information and
* how to reach the author. * 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 #ifndef __DVBOSD_H
@ -20,16 +20,21 @@
#define MAXNUMCOLORS 16 #define MAXNUMCOLORS 16
enum eDvbColor { enum eDvbColor {
#ifndef DEBUG_OSD
clrTransparent = 0x00000000,
#endif
clrBackground = 0x7F000000, // 50% gray
#ifdef DEBUG_OSD #ifdef DEBUG_OSD
clrBackground,
clrTransparent = clrBackground, clrTransparent = clrBackground,
clrBlack = clrBackground, clrBlack = clrBackground,
clrRed,
clrGreen,
clrYellow,
clrBlue,
clrMagenta,
clrCyan,
clrWhite,
#else #else
clrTransparent = 0x00000000,
clrBackground = 0x7F000000, // 50% gray
clrBlack = 0xFF000000, clrBlack = 0xFF000000,
#endif
clrRed = 0xFF1414FC, clrRed = 0xFF1414FC,
clrGreen = 0xFF24FC24, clrGreen = 0xFF24FC24,
clrYellow = 0xFF24C0FC, clrYellow = 0xFF24C0FC,
@ -37,6 +42,7 @@ enum eDvbColor {
clrBlue = 0xFFFC0000, clrBlue = 0xFFFC0000,
clrCyan = 0xFFFCFC00, clrCyan = 0xFFFCFC00,
clrWhite = 0xFFFCFCFC, clrWhite = 0xFFFCFCFC,
#endif
}; };
class cPalette { class cPalette {

6
menu.c
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and * See the main source file 'vdr.c' for copyright information and
* how to reach the author. * 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" #include "menu.h"
@ -2190,9 +2190,8 @@ void cReplayControl::Show(int Seconds)
Interface->Open(Setup.OSDwidth, -3); Interface->Open(Setup.OSDwidth, -3);
needsFastResponse = visible = true; needsFastResponse = visible = true;
shown = ShowProgress(true); shown = ShowProgress(true);
if (Seconds > 0) { if (Seconds > 0)
timeoutShow = time(NULL) + Seconds; timeoutShow = time(NULL) + Seconds;
}
} }
} }
@ -2213,6 +2212,7 @@ bool cReplayControl::ShowProgress(bool Initial)
Interface->Clear(); Interface->Clear();
if (title) if (title)
Interface->Write(0, 0, title); Interface->Write(0, 0, title);
lastCurrent = lastTotal = -1;
} }
if (Total != lastTotal) { if (Total != lastTotal) {
Interface->Write(-7, 2, IndexToHMSF(Total)); Interface->Write(-7, 2, IndexToHMSF(Total));