Permalink
Browse files

Subtitles: Rename the OSDSubFont setting to DefaultSubtitleFont.

This setting is used for all types of captions: CEA-608, CEA-708,
text, and teletext.  The problem is that CEA-608 and teletext are
supposed to use a monospaced font for proper display, but the default
setting was FreeSans, a proportional spaced font.  Most users are
likely to have FreeSans stuck in their database, if they've ever tried
displaying captions/subtitles or visited the Playback OSD settings
page.

Subtitle/caption users may need a one-time revisit of the Playback OSD
settings page if they prefer a font other than FreeMono.
  • Loading branch information...
1 parent 6202c0d commit 6f24f3be16090c7ea259b3e22d3ae4648f493bc9 @stichnot stichnot committed Mar 1, 2012
@@ -99,7 +99,8 @@ bool SubtitleScreen::Create(void)
m_useBackground = (bool)gCoreContext->GetNumSetting("CCBackground", 0);
m_textFontZoom = gCoreContext->GetNumSetting("OSDCC708TextZoom", 100);
- QString defaultFont = gCoreContext->GetSetting("OSDSubFont", "FreeSans");
+ QString defaultFont =
+ gCoreContext->GetSetting("DefaultSubtitleFont", "FreeMono");
m_fontNames.append(defaultFont); // default
m_fontNames.append("FreeMono"); // mono serif
m_fontNames.append("DejaVu Serif"); // prop serif
@@ -674,7 +674,7 @@ void TeletextScreen::DrawStatus(void)
bool TeletextScreen::InitialiseFont()
{
static bool initialised = false;
- QString font = gCoreContext->GetSetting("OSDSubFont", "FreeSans");
+ QString font = gCoreContext->GetSetting("DefaultSubtitleFont", "FreeMono");
if (initialised)
{
if (gTTFont->face().family() == font)
@@ -1370,7 +1370,7 @@ static HostSpinBox *OSDCC708TextZoomPercentage(void)
static HostComboBox *SubtitleFont()
{
- HostComboBox *hcb = new HostComboBox("OSDSubFont");
+ HostComboBox *hcb = new HostComboBox("DefaultSubtitleFont");
QFontDatabase db;
QStringList fonts = db.families();
QStringList hide = db.families(QFontDatabase::Symbol);
@@ -1380,7 +1380,7 @@ static HostComboBox *SubtitleFont()
foreach (QString font, fonts)
{
if (!hide.contains(font))
- hcb->addSelection(font, font, font.toLower() == "freesans");
+ hcb->addSelection(font, font, font.toLower() == "freemono");
}
return hcb;
}

0 comments on commit 6f24f3b

Please sign in to comment.