summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--config.c5
-rw-r--r--config.h3
-rw-r--r--osd.c3
3 files changed, 8 insertions, 3 deletions
diff --git a/config.c b/config.c
index 669228b7..1516e15a 100644
--- a/config.c
+++ b/config.c
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: config.c 2.2 2009/05/03 13:58:08 kls Exp $
+ * $Id: config.c 2.3 2009/05/09 10:41:50 kls Exp $
*/
#include "config.h"
@@ -270,6 +270,7 @@ cSetup::cSetup(void)
OSDTop = 45;
OSDWidth = 624;
OSDHeight = 486;
+ OSDAspect = 1.0;
OSDMessageTime = 1;
UseSmallFont = 1;
AntiAlias = 1;
@@ -455,6 +456,7 @@ bool cSetup::Parse(const char *Name, const char *Value)
else if (!strcasecmp(Name, "OSDTop")) OSDTop = atoi(Value);
else if (!strcasecmp(Name, "OSDWidth")) { OSDWidth = atoi(Value); OSDWidth &= ~0x07; } // OSD width must be a multiple of 8
else if (!strcasecmp(Name, "OSDHeight")) OSDHeight = atoi(Value);
+ else if (!strcasecmp(Name, "OSDAspect")) OSDAspect = atof(Value);
else if (!strcasecmp(Name, "OSDMessageTime")) OSDMessageTime = atoi(Value);
else if (!strcasecmp(Name, "UseSmallFont")) UseSmallFont = atoi(Value);
else if (!strcasecmp(Name, "AntiAlias")) AntiAlias = atoi(Value);
@@ -545,6 +547,7 @@ bool cSetup::Save(void)
Store("OSDTop", OSDTop);
Store("OSDWidth", OSDWidth);
Store("OSDHeight", OSDHeight);
+ Store("OSDAspect", OSDAspect);
Store("OSDMessageTime", OSDMessageTime);
Store("UseSmallFont", UseSmallFont);
Store("AntiAlias", AntiAlias);
diff --git a/config.h b/config.h
index 43032559..bd1e3f58 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: config.h 2.11 2009/05/09 10:26:37 kls Exp $
+ * $Id: config.h 2.12 2009/05/09 10:40:04 kls Exp $
*/
#ifndef __CONFIG_H
@@ -246,6 +246,7 @@ public:
int ChannelInfoTime;
double OSDLeftP, OSDTopP, OSDWidthP, OSDHeightP;
int OSDLeft, OSDTop, OSDWidth, OSDHeight;
+ double OSDAspect;
int OSDMessageTime;
int UseSmallFont;
int AntiAlias;
diff --git a/osd.c b/osd.c
index 77caa405..d16dafbd 100644
--- a/osd.c
+++ b/osd.c
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: osd.c 2.4 2009/05/08 15:29:20 kls Exp $
+ * $Id: osd.c 2.5 2009/05/09 10:42:35 kls Exp $
*/
#include "osd.h"
@@ -926,6 +926,7 @@ void cOsdProvider::UpdateOsdSize(bool Force)
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));