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

Added plain text error messages to log entries from cOsd::SetAreas()

Browse Source
This commit is contained in:
Klaus Schmidinger 2010-01-17 13:32:12 +01:00
parent 3c5b11abbb
commit 27939266f1
4 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CONTRIBUTORS
View File

@ -1090,6 +1090,7 @@ Rolf Ahrenberg <rahrenbe@cc.hut.fi>
in some syslog calls in some syslog calls
for a patch that was used to implement handling the "component descriptor" ("genre") for a patch that was used to implement handling the "component descriptor" ("genre")
for a patch that was used to implement handling the "parental rating descriptor" for a patch that was used to implement handling the "parental rating descriptor"
suggesting to add plain text error messages to log entries from cOsd::SetAreas()
Ralf Klueber <ralf.klueber@vodafone.com> Ralf Klueber <ralf.klueber@vodafone.com>
for reporting a bug in cutting a recording if there is only a single editing mark for reporting a bug in cutting a recording if there is only a single editing mark

2
HISTORY
View File

@ -6287,3 +6287,5 @@ Video Disk Recorder Revision History
is opened only for the local host (thanks to Manuel Reimer). is opened only for the local host (thanks to Manuel Reimer).
- Renamed 'runvdr' to 'runvdr.template' and no longer copying it to the BINDIR - Renamed 'runvdr' to 'runvdr.template' and no longer copying it to the BINDIR
in 'make install' (thanks to Martin Dauskardt). in 'make install' (thanks to Martin Dauskardt).
- Added plain text error messages to log entries from cOsd::SetAreas() (suggested
by Rolf Ahrenberg).

16
osd.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: osd.c 2.6 2009/12/06 11:33:47 kls Exp $ * $Id: osd.c 2.7 2010/01/17 13:27:24 kls Exp $
*/ */
#include "osd.h" #include "osd.h"
@ -724,6 +724,18 @@ void cBitmap::ShrinkBpp(int NewBpp)
// --- cOsd ------------------------------------------------------------------ // --- cOsd ------------------------------------------------------------------
static const char *OsdErrorTexts[] = {
"ok",
"too many areas",
"too many colors",
"bpp not supported",
"areas overlap",
"wrong alignment",
"out of memory",
"wrong area size",
"unknown",
};
int cOsd::osdLeft = 0; int cOsd::osdLeft = 0;
int cOsd::osdTop = 0; int cOsd::osdTop = 0;
int cOsd::osdWidth = 0; int cOsd::osdWidth = 0;
@ -814,7 +826,7 @@ eOsdError cOsd::SetAreas(const tArea *Areas, int NumAreas)
} }
} }
else else
esyslog("ERROR: cOsd::SetAreas returned %d", Result); esyslog("ERROR: cOsd::SetAreas returned %d (%s)", Result, Result < oeUnknown ? OsdErrorTexts[Result] : OsdErrorTexts[oeUnknown]);
return Result; return Result;
} }

4
osd.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: osd.h 2.4 2009/05/08 13:41:03 kls Exp $ * $Id: osd.h 2.5 2010/01/17 13:23:50 kls Exp $
*/ */
#ifndef __OSD_H #ifndef __OSD_H
@ -36,7 +36,7 @@ enum {
clrWhite = 0xFFFCFCFC, clrWhite = 0xFFFCFCFC,
}; };
enum eOsdError { oeOk, enum eOsdError { oeOk, // see also OsdErrorTexts in osd.c
oeTooManyAreas, oeTooManyAreas,
oeTooManyColors, oeTooManyColors,
oeBppNotSupported, oeBppNotSupported,