Ticket #368: mythtv_teletext_20060310.diff
File mythtv_teletext_20060310.diff, 2.9 KB (added by , 18 years ago) |
---|
-
libs/libmythtv/NuppelVideoPlayer.cpp
118 118 kDisplaySubtitle, 119 119 kDisplayCC608, 120 120 kDisplayCC708, 121 kDisplay None,121 kDisplayTeletextA, 122 122 kDisplayTeletextB, 123 123 }; 124 124 … … 1348 1348 } 1349 1349 } 1350 1350 1351 uint NuppelVideoPlayer::GetCaptionMode(void) 1352 { 1353 if (decoder->GetTeletextDecoderType() >= 0) 1354 return kDisplayTeletextA; 1355 else 1356 return textDisplayMode; 1357 } 1358 1351 1359 void NuppelVideoPlayer::ResetCaptions(uint mode_override) 1352 1360 { 1353 1361 uint origMode = textDisplayMode; … … 2850 2858 osd->DisableFade(); 2851 2859 } 2852 2860 osd->SetCC708Service(&CC708services[1]); 2861 2862 OSDSet *oset = osd->GetSet("teletext"); 2863 OSDType *traw = NULL; 2864 if (oset) 2865 traw = oset->GetType("teletext"); 2866 2867 OSDTypeTeletext *tt_view = dynamic_cast<OSDTypeTeletext*>(traw); 2868 if (tt_view) 2869 { 2870 decoder->SetTeletextDecoderViewer(tt_view); 2871 tt_view->SetDisplaying(false); 2872 } 2853 2873 } 2854 2874 2855 2875 playing = true; -
libs/libmythtv/NuppelVideoPlayer.h
269 269 void AddSubtitle(const AVSubtitle& subtitle); 270 270 271 271 // Closed caption and teletext stuff 272 uint GetCaptionMode(void) const { return textDisplayMode; }272 uint GetCaptionMode(void); 273 273 void ResetCaptions(uint mode_override = 0); 274 274 void DisableCaptions(uint mode, bool osd_msg = true); 275 275 void EnableCaptions(uint mode); -
libs/libmythtv/osdtypeteletext.cpp
1007 1007 } 1008 1008 else 1009 1009 { 1010 char ch = CharConversion(ch, lang);1010 char ch2 = CharConversion(ch, lang); 1011 1011 bool dh = doubleheight && row < (uint)kTeletextRows; 1012 1012 int rw = (dh) ? row + 1 : row; 1013 DrawCharacter(x, rw, ch , dh);1013 DrawCharacter(x, rw, ch2, dh); 1014 1014 } 1015 1015 } 1016 1016 } -
libs/libmythtv/tv_play.cpp
1771 1771 ClearInputQueues(false); 1772 1772 AddKeyToInputQueue(0); 1773 1773 } 1774 else if (activenvp->GetCaptionMode() & kDisplayTeletextA) 1775 { 1776 activenvp->ToggleCaptions(4); 1777 } 1774 1778 else 1775 1779 { 1776 1780 activenvp->ToggleCaptions();