[Redbutton-devel] SF.net SVN: redbutton:[508] redbutton-browser/trunk/MHEGFont.c
Brought to you by:
skilvington
|
From: <ski...@us...> - 2008-12-09 14:12:19
|
Revision: 508
http://redbutton.svn.sourceforge.net/redbutton/?rev=508&view=rev
Author: skilvington
Date: 2008-12-09 14:12:15 +0000 (Tue, 09 Dec 2008)
Log Message:
-----------
clean up font choosing
Modified Paths:
--------------
redbutton-browser/trunk/MHEGFont.c
Modified: redbutton-browser/trunk/MHEGFont.c
===================================================================
--- redbutton-browser/trunk/MHEGFont.c 2008-12-09 09:45:44 UTC (rev 507)
+++ redbutton-browser/trunk/MHEGFont.c 2008-12-09 14:12:15 UTC (rev 508)
@@ -115,34 +115,23 @@
*/
static char *_default_font_name = NULL;
-static char *_font_name_tiresias = "TiresiasScreenfont";
-static char *_font_name_freesans = "FreeSans";
-static char *_font_name_sans = "sans";
void
MHEGFont_defaultName(MHEGFont *font)
{
+ char *try_font[] = { "TiresiasScreenfont", "FreeSans", "sans", NULL };
char *fontname;
+ unsigned int i;
/* first time */
if(_default_font_name == NULL)
{
- /* do we have Tiresias */
- if(match_font(_font_name_tiresias, &fontname))
- {
- _default_font_name = safe_strdup(fontname);
- }
- else if(match_font(_font_name_freesans, &fontname))
- {
- _default_font_name = safe_strdup(fontname);
- error("Font '%s' not available; using '%s' for 'rec://font/uk1'", _font_name_tiresias, fontname);
- }
- else
- {
- match_font(_font_name_sans, &fontname);
- _default_font_name = safe_strdup(fontname);
- error("Font '%s' not available; using '%s' for 'rec://font/uk1'", _font_name_tiresias, fontname);
- }
+ /* look for fonts in order */
+ for(i=0; try_font[i] && !match_font(try_font[i], &fontname); i++)
+ /* do nothing */;
+ _default_font_name = safe_strdup(fontname);
+ if(i > 0)
+ error("Font '%s' not available; using '%s' for 'rec://font/uk1'", try_font[0], fontname);
}
font->name = _default_font_name;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|