Permalink
Browse files

Subtitles: Remove the Prefer708Captions setting.

CEA-708 closed captions are now in very good shape, so there is no
particular reason to favor the "legacy" CEA-608 captions.
  • Loading branch information...
1 parent 73d20c4 commit 631bb1e765a7b0292a04bb76c6317f9ec2db2599 @stichnot stichnot committed Apr 12, 2012
@@ -174,7 +174,7 @@ MythPlayer::MythPlayer(PlayerFlags flags)
enableForcedSubtitles(false), disableForcedSubtitles(false),
allowForcedSubtitles(true),
// CC608/708
- db_prefer708(true), cc608(this), cc708(this),
+ cc608(this), cc708(this),
// MHEG/MHI Interactive TV visible in OSD
itvVisible(false),
interactiveTV(NULL),
@@ -227,7 +227,6 @@ MythPlayer::MythPlayer(PlayerFlags flags)
captionsEnabledbyDefault = gCoreContext->GetNumSetting("DefaultCCMode");
decode_extra_audio = gCoreContext->GetNumSetting("DecodeExtraAudio", 0);
itvEnabled = gCoreContext->GetNumSetting("EnableMHEG", 0);
- db_prefer708 = gCoreContext->GetNumSetting("Prefer708Captions", 1);
clearSavedPosition = gCoreContext->GetNumSetting("ClearSavedPosition", 1);
endExitPrompt = gCoreContext->GetNumSetting("EndOfRecordingExitPrompt");
pip_default_loc = (PIPLocation)gCoreContext->GetNumSetting("PIPLocation", kPIPTopLeft);
@@ -1667,19 +1666,19 @@ bool MythPlayer::HasCaptionTrack(int mode)
int MythPlayer::NextCaptionTrack(int mode)
{
- // Text->TextStream->708/608->608/708->AVSubs->Teletext->NUV->None
+ // Text->TextStream->708->608->AVSubs->Teletext->NUV->None
// NUV only offerred if PAL
bool pal = (vbimode == VBIMode::PAL_TT);
int nextmode = kDisplayNone;
if (kDisplayTextSubtitle == mode)
nextmode = kDisplayRawTextSubtitle;
- if (kDisplayRawTextSubtitle == mode)
- nextmode = db_prefer708 ? kDisplayCC708 : kDisplayCC608;
+ else if (kDisplayRawTextSubtitle == mode)
+ nextmode = kDisplayCC708;
else if (kDisplayCC708 == mode)
- nextmode = db_prefer708 ? kDisplayCC608 : kDisplayAVSubtitle;
+ nextmode = kDisplayCC608;
else if (kDisplayCC608 == mode)
- nextmode = db_prefer708 ? kDisplayAVSubtitle : kDisplayCC708;
+ nextmode = kDisplayAVSubtitle;
else if (kDisplayAVSubtitle == mode)
nextmode = kDisplayTeletextCaptions;
else if (kDisplayTeletextCaptions == mode)
@@ -696,7 +696,6 @@ class MTV_PUBLIC MythPlayer
bool allowForcedSubtitles;
// CC608/708
- bool db_prefer708;
CC608Reader cc608;
CC708Reader cc708;
@@ -1503,19 +1503,6 @@ static HostCheckBox *DefaultCCMode()
return gc;
}
-static HostCheckBox *PreferCC708()
-{
- HostCheckBox *gc = new HostCheckBox("Prefer708Captions");
- gc->setLabel(QObject::tr("Prefer EIA-708 over EIA-608 captions"));
- gc->setValue(true);
- gc->setHelpText(
- QObject::tr(
- "If enabled, the newer EIA-708 captions will be preferred over "
- "the older EIA-608 captions in ATSC streams."));
-
- return gc;
-}
-
static HostCheckBox *EnableMHEG()
{
HostCheckBox *gc = new HostCheckBox("EnableMHEG");
@@ -3537,7 +3524,6 @@ OSDSettings::OSDSettings()
osd->addChild(BrowseAllTuners());
osd->addChild(CCBackground());
osd->addChild(DefaultCCMode());
- osd->addChild(PreferCC708());
osd->addChild(SubtitleFont());
osd->addChild(OSDCC708TextZoomPercentage());
osd->addChild(SubtitleCodec());

0 comments on commit 631bb1e

Please sign in to comment.