summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Kendall <mkendall@mythtv.org>2011-02-01 02:01:13 (GMT)
committer Mark Kendall <mkendall@mythtv.org>2011-02-01 02:05:08 (GMT)
commite6e1964f17d5b58e57d993702f34050dc79baf06 (patch)
tree6fb9225fdabc24f697509db9c87eb02d70b78be2
parent1e8e703c0accbd710f22603a6b7d8ba182863170 (diff)
Reset the CEA-708 font stretch property when re-initialised.
(cherry picked from commit 399c1bcd31d6ebf4873bf722d235b2789b4f8be8)
-rw-r--r--mythtv/libs/libmythtv/subtitlescreen.cpp10
1 files changed, 6 insertions, 4 deletions
diff --git a/mythtv/libs/libmythtv/subtitlescreen.cpp b/mythtv/libs/libmythtv/subtitlescreen.cpp
index 0272faf..46b3dae 100644
--- a/mythtv/libs/libmythtv/subtitlescreen.cpp
+++ b/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)