Ticket #368: teletext.2.diff

libs/libmythtv/tv_play.cpp

@@ -129 +129 @@
     REG_KEY("TV Playback", "TOGGLECC608",   "Toggle VBI CC",         "");
     REG_KEY("TV Playback", "TOGGLECC708",   "Toggle ATSC CC",        "");
 
-    REG_KEY("TV Playback", "TOGGLETTM",     "Toggle Teletext Menu",  "");
+    REG_KEY("TV Playback", "TOGGLETTM",     "Toggle Teletext",  "");
 
     REG_KEY("TV Playback", "SELECTAUDIO_0", "Play audio track 1",    "");
     REG_KEY("TV Playback", "SELECTAUDIO_1", "Play audio track 2",    "");
@@ -6336 +6336 @@
     {
         item = new OSDGenericTree(treeMenu, tr("Toggle Teletext Captions"),
                                   "TOGGLETTC");
-        item = new OSDGenericTree(treeMenu, tr("Toggle Teletext Menu"),
+        item = new OSDGenericTree(treeMenu, tr("Toggle Teletext"),
                                   "TOGGLETTM");
-        FillMenuTracks(treeMenu, kDisplayTeletextCaptions);
+        FillMenuTracks(treeMenu, kTrackTypeTeletextCaptions);
     }
 
     int letterbox = nvp->GetLetterbox();
@@ -6506 +6506 @@
         grpStr  = "CC608GROUP";
         sel     = activenvp->GetCaptionMode() & kDisplayCC708;
     }
-    else if (kDisplayTeletextCaptions == type)
+    else if (kTrackTypeTeletextCaptions == type)
     {
         mainMsg = tr("Select DVB CC");
         typeStr = "TTC";
         selStr  = "SELECTTTC_";
         grpStr  = "TTCGROUP";
-        sel     = activenvp->GetCaptionMode() & kDisplayTeletextCaptions;
+        sel     = activenvp->GetCaptionMode() & kTrackTypeTeletextCaptions;
     }
     else
     {