Permalink
Browse files

Reset the CEA-708 font stretch property when re-initialised.

(cherry picked from commit 399c1bc)
  • Loading branch information...
1 parent 1e8e703 commit e6e1964f17d5b58e57d993702f34050dc79baf06 Mark Kendall committed Feb 1, 2011
Showing with 6 additions and 4 deletions.
  1. +6 −4 mythtv/libs/libmythtv/subtitlescreen.cpp
@@ -951,13 +951,14 @@ bool SubtitleScreen::Initialise708Fonts(int fontStretch)
{
static bool initialised = false;
if (initialised)
+ {
+ foreach(MythFontProperties* font, gCC708Fonts)
+ font->face().setStretch(fontStretch);
return true;
-
- initialised = true;
+ }
VERBOSE(VB_IMPORTANT, "Initialise708Fonts()");
- // TODO remove extra fonts from settings page
QStringList fonts;
fonts.append("Droid Sans Mono"); // default
fonts.append("FreeMono"); // mono serif
@@ -982,8 +983,9 @@ bool SubtitleScreen::Initialise708Fonts(int fontStretch)
count++;
}
}
+ initialised = count > 0;
VERBOSE(VB_PLAYBACK, LOC + QString("Loaded %1 CEA-708 fonts").arg(count));
- return true;
+ return initialised;
}
MythFontProperties* SubtitleScreen::Get708Font(CC708CharacterAttribute attr)

0 comments on commit e6e1964

Please sign in to comment.