From 2a60d695e5682f60fd0627df6c88abafd818f4b2 Mon Sep 17 00:00:00 2001
From: Francois Cartegnie <fcvlcdev@free.fr>
Date: Fri, 21 Mar 2014 19:33:39 +0100
Subject: [PATCH] text_style/renderer: unify default font size
---
include/vlc_text_style.h | 2 ++
modules/text_renderer/text_renderer.c | 4 ++--
src/misc/text_style.c | 2 +-
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/include/vlc_text_style.h b/include/vlc_text_style.h
index 722387abc915..7398dd492417 100644
--- a/include/vlc_text_style.h
+++ b/include/vlc_text_style.h
@@ -77,6 +77,8 @@ typedef struct
#define STYLE_UNDERLINE 32
#define STYLE_STRIKEOUT 64
+#define STYLE_DEFAULT_FONT_SIZE 22
+
/**
* Create a default text style
*/
diff --git a/modules/text_renderer/text_renderer.c b/modules/text_renderer/text_renderer.c
index d272621e19e9..36485818a6fc 100644
--- a/modules/text_renderer/text_renderer.c
+++ b/modules/text_renderer/text_renderer.c
@@ -325,7 +325,7 @@ int HandleFontAttributes( xml_reader_t *p_xml_reader,
uint32_t i_font_color = 0xffffff;
int i_font_alpha = 255;
uint32_t i_karaoke_bg_color = 0x00ffffff;
- int i_font_size = 24;
+ int i_font_size = STYLE_DEFAULT_FONT_SIZE;
/* Default all attributes to the top font in the stack -- in case not
* all attributes are specified in the sub-font
@@ -411,7 +411,7 @@ int HandleTT(font_stack_t **p_fonts, const char *p_fontfamily )
char *psz_unused_fontname = NULL;
uint32_t i_font_color = 0xffffff;
uint32_t i_karaoke_bg_color = 0x00ffffff;
- int i_font_size = 24;
+ int i_font_size = STYLE_DEFAULT_FONT_SIZE;
/* Default all attributes to the top font in the stack -- in case not
* all attributes are specified in the sub-font
diff --git a/src/misc/text_style.c b/src/misc/text_style.c
index 2763a25118dd..a779814ea4eb 100644
--- a/src/misc/text_style.c
+++ b/src/misc/text_style.c
@@ -38,7 +38,7 @@ text_style_t *text_style_New( void )
/* initialize to default text style */
p_style->psz_fontname = NULL;
p_style->psz_monofontname = NULL;
- p_style->i_font_size = 22;
+ p_style->i_font_size = STYLE_DEFAULT_FONT_SIZE;
p_style->i_font_color = 0xffffff;
p_style->i_font_alpha = 0xff;
p_style->i_style_flags = STYLE_OUTLINE;
--
GitLab