summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2007-06-17 11:54:54 +0200
committerKlaus Schmidinger <vdr@tvdr.de>2007-06-17 11:54:54 +0200
commit5fec367e604e642727437067ecd0cad32728ae87 (patch)
tree7f35e614e8a705f28f9537d8704d53e6fabbe2e9
parent3c68ef28d0518579c4269c3545699c623d8df47b (diff)
downloadvdr-5fec367e604e642727437067ecd0cad32728ae87.tar.gz
vdr-5fec367e604e642727437067ecd0cad32728ae87.tar.bz2
Centralized default font names
-rw-r--r--config.c8
-rw-r--r--font.c6
-rw-r--r--font.h6
-rw-r--r--menu.c8
4 files changed, 18 insertions, 10 deletions
diff --git a/config.c b/config.c
index 2c86fa38..529a8696 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 1.152 2007/06/16 09:30:22 kls Exp $
+ * $Id: config.c 1.153 2007/06/17 11:54:54 kls Exp $
*/
#include "config.h"
@@ -265,9 +265,9 @@ cSetup::cSetup(void)
OSDMessageTime = 1;
UseSmallFont = 1;
AntiAlias = 1;
- strcpy(FontOsd, "arialbd.ttf");
- strcpy(FontSml, "arial.ttf");
- strcpy(FontFix, "courbd.ttf");
+ strcpy(FontOsd, DefaultFontOsd);
+ strcpy(FontSml, DefaultFontSml);
+ strcpy(FontFix, DefaultFontFix);
FontOsdSize = 22;
FontSmlSize = 18;
FontFixSize = 20;
diff --git a/font.c b/font.c
index f2933e64..b037fb11 100644
--- a/font.c
+++ b/font.c
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: font.c 1.17 2007/06/17 11:46:25 kls Exp $
+ * $Id: font.c 1.18 2007/06/17 11:54:10 kls Exp $
*/
#include "font.h"
@@ -16,6 +16,10 @@
#include "osd.h"
#include "tools.h"
+const char *DefaultFontOsd = "Sans Serif:Bold";
+const char *DefaultFontSml = "Sans Serif";
+const char *DefaultFontFix = "Courier:Bold";
+
// --- cFreetypeFont ---------------------------------------------------------
#define KERNING_UNKNOWN (-10000)
diff --git a/font.h b/font.h
index 081199e0..4810dd0e 100644
--- a/font.h
+++ b/font.h
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: font.h 1.17 2007/06/17 11:07:15 kls Exp $
+ * $Id: font.h 1.18 2007/06/17 11:53:55 kls Exp $
*/
#ifndef __FONT_H
@@ -28,6 +28,10 @@ class cBitmap;
typedef uint32_t tColor; // see also osd.h
typedef uint8_t tIndex;
+extern const char *DefaultFontOsd;
+extern const char *DefaultFontSml;
+extern const char *DefaultFontFix;
+
class cFont {
private:
static cFont *fonts[];
diff --git a/menu.c b/menu.c
index 6217d693..084d75ef 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: menu.c 1.453 2007/06/17 11:01:13 kls Exp $
+ * $Id: menu.c 1.454 2007/06/17 11:54:35 kls Exp $
*/
#include "menu.h"
@@ -2179,9 +2179,9 @@ cMenuSetupOSD::cMenuSetupOSD(void)
cFont::GetAvailableFontNames(&fontOsdNames);
cFont::GetAvailableFontNames(&fontSmlNames);
cFont::GetAvailableFontNames(&fontFixNames, true);
- fontOsdNames.Insert(strdup("Sans Serif:Bold"));
- fontSmlNames.Insert(strdup("Sans Serif"));
- fontFixNames.Insert(strdup("Courier:Bold"));
+ fontOsdNames.Insert(strdup(DefaultFontOsd));
+ fontSmlNames.Insert(strdup(DefaultFontSml));
+ fontFixNames.Insert(strdup(DefaultFontFix));
fontOsdIndex = max(0, fontOsdNames.Find(Setup.FontOsd));
fontSmlIndex = max(0, fontSmlNames.Find(Setup.FontSml));
fontFixIndex = max(0, fontFixNames.Find(Setup.FontFix));