diff options
Diffstat (limited to 'osd.c')
| -rw-r--r-- | osd.c | 11 |
1 files changed, 6 insertions, 5 deletions
@@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: osd.c 2.3 2009/05/03 13:52:47 kls Exp $ + * $Id: osd.c 2.5 2009/05/09 10:42:35 kls Exp $ */ #include "osd.h" @@ -883,7 +883,7 @@ void cOsd::Flush(void) cOsdProvider *cOsdProvider::osdProvider = NULL; int cOsdProvider::oldWidth = 0; int cOsdProvider::oldHeight = 0; -int cOsdProvider::oldAspect = va4_3; +double cOsdProvider::oldAspect = 1.0; cOsdProvider::cOsdProvider(void) { @@ -919,13 +919,14 @@ void cOsdProvider::UpdateOsdSize(bool Force) { int Width; int Height; - eVideoAspect Aspect; - cDevice::PrimaryDevice()->GetVideoSize(Width, Height, Aspect); + double Aspect; + cDevice::PrimaryDevice()->GetOsdSize(Width, Height, Aspect); if (Width != oldWidth || Height != oldHeight || Aspect != oldAspect || Force) { Setup.OSDLeft = int(round(Width * Setup.OSDLeftP)); Setup.OSDTop = int(round(Height * Setup.OSDTopP)); Setup.OSDWidth = int(round(Width * Setup.OSDWidthP)) & ~0x07; // OSD width must be a multiple of 8 Setup.OSDHeight = int(round(Height * Setup.OSDHeightP)); + Setup.OSDAspect = Aspect; Setup.FontOsdSize = int(round(Height * Setup.FontOsdSizeP)); Setup.FontFixSize = int(round(Height * Setup.FontFixSizeP)); Setup.FontSmlSize = int(round(Height * Setup.FontSmlSizeP)); @@ -935,7 +936,7 @@ void cOsdProvider::UpdateOsdSize(bool Force) oldWidth = Width; oldHeight = Height; oldAspect = Aspect; - dsyslog("OSD size changed to %dx%d @ %s", Width, Height, VideoAspectString[Aspect]); + dsyslog("OSD size changed to %dx%d @ %g", Width, Height, Aspect); } } |