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

Made the log message 'OSD window width must be a multiple of 4...' a debug message

Browse Source
This commit is contained in:
Klaus Schmidinger 2003-03-23 15:54:52 +01:00
parent b736f36e1e
commit 918bcdc054
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
HISTORY
View File

@ -1996,3 +1996,5 @@ Video Disk Recorder Revision History
- The "Left" and "Right" buttons now set the cursor to the first or last list item - The "Left" and "Right" buttons now set the cursor to the first or last list item
even if the list consist only of a single page, like, for instance, the Main menu even if the list consist only of a single page, like, for instance, the Main menu
(thanks to Oliver Endriss). (thanks to Oliver Endriss).
- Made the log message "OSD window width must be a multiple of 4..." a debug message
instead of an error message, so it can be avoided by using a log level less than 3.

6
osdbase.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: osdbase.c 1.7 2002/08/25 10:02:36 kls Exp $ * $Id: osdbase.c 1.8 2003/03/23 15:53:29 kls Exp $
*/ */
#include "osdbase.h" #include "osdbase.h"
@ -355,7 +355,7 @@ tWindowHandle cOsdBase::Create(int x, int y, int w, int h, int Bpp, bool ClearWi
if (x >= 0 && y >= 0 && w > 0 && h > 0 && (Bpp == 1 || Bpp == 2 || Bpp == 4 || Bpp == 8)) { if (x >= 0 && y >= 0 && w > 0 && h > 0 && (Bpp == 1 || Bpp == 2 || Bpp == 4 || Bpp == 8)) {
if ((w & 0x03) != 0) { if ((w & 0x03) != 0) {
w += 4 - (w & 0x03); w += 4 - (w & 0x03);
esyslog("ERROR: OSD window width must be a multiple of 4 - increasing to %d", w); dsyslog("OSD window width must be a multiple of 4 - increasing to %d", w);
} }
cWindow *win = new cWindow(numWindows, x, y, w, h, Bpp, ClearWithBackground, Tiled); cWindow *win = new cWindow(numWindows, x, y, w, h, Bpp, ClearWithBackground, Tiled);
if (OpenWindow(win)) { if (OpenWindow(win)) {
@ -474,7 +474,7 @@ void cOsdBase::Relocate(tWindowHandle Window, int x, int y, int NewWidth, int Ne
if (NewWidth > 0 && NewHeight > 0) { if (NewWidth > 0 && NewHeight > 0) {
if ((NewWidth & 0x03) != 0) { if ((NewWidth & 0x03) != 0) {
NewWidth += 4 - (NewWidth & 0x03); NewWidth += 4 - (NewWidth & 0x03);
esyslog("ERROR: OSD window width must be a multiple of 4 - increasing to %d", NewWidth); dsyslog("OSD window width must be a multiple of 4 - increasing to %d", NewWidth);
} }
CloseWindow(w); CloseWindow(w);
cWindow *NewWindow = new cWindow(w->Handle(), x, y, NewWidth, NewHeight, w->Bpp(), w->ClearWithBackground(), w->Tiled()); cWindow *NewWindow = new cWindow(w->Handle(), x, y, NewWidth, NewHeight, w->Bpp(), w->ClearWithBackground(), w->Tiled());