Ticket #2210: teletext_subtitle_toggle.diff

libs/libmythtv/NuppelVideoPlayer.cpp

@@ -180 +180 @@
 
       // General Caption/Teletext/Subtitle support
       textDisplayMode(kDisplayNone),
+      prevTextDisplayMode(kDisplayNone),
       // Support for analog captions and teletext
       vbimode(VBIMode::None),       
       ttPageNum(0x888),             ccmode(CC_CC1),
@@ -1555 +1556 @@
         tt_view->SetPage(0x100, -1);
         oset->Display();
         osd->SetVisible(oset, 0);
+        prevTextDisplayMode = textDisplayMode;
         textDisplayMode = kDisplayTeletextMenu;
     }
 }
@@ -1569 +1571 @@
         tt_view->SetDisplaying(false);
     GetOSD()->HideSet("teletext");
 
-    textDisplayMode = kDisplayNone;
-    
+    /* If subtitles are enabled before the teletext menu was displayed, re-enabled them */
+    if (prevTextDisplayMode & kDisplayAllCaptions) {
+        textDisplayMode = prevTextDisplayMode;
+    }
+    else {
+        textDisplayMode = kDisplayNone;
+    }
+
 }
 
 void NuppelVideoPlayer::ResetTeletext(void)

libs/libmythtv/NuppelVideoPlayer.h

@@ -595 +595 @@
 
     // General Caption/Teletext/Subtitle support
     uint     textDisplayMode;
+    uint     prevTextDisplayMode;
 
     // Support for analog captions and teletext
     // (i.e. Vertical Blanking Interval (VBI) encoded data.)