Ticket #4444: patch-vbiccfirst.cpp

File patch-vbiccfirst.cpp, 1.6 KB (added by anonymous, 12 years ago)
Line 
1*** ../mythtv-0.20.2.orig/libs/libmythtv/NuppelVideoPlayer.cpp  2007-07-30 10:45:45.000000000 -0700
2--- ../mythtv-0.20.2/libs/libmythtv/NuppelVideoPlayer.cpp       2008-01-07 08:37:26.633875522 -0800
3***************
4*** 1653,1671 ****
5          EnableCaptions(kDisplayAVSubtitle, osd_msg);
6      else if (textSubtitles.GetSubtitleCount() > 0)
7          EnableCaptions(kDisplayTextSubtitle, osd_msg);
8-     else if (decoder->GetTrackCount(kTrackTypeCC708))
9-         EnableCaptions(kDisplayCC708, osd_msg);
10      else if (decoder->GetTrackCount(kTrackTypeTeletextCaptions))
11          EnableCaptions(kDisplayTeletextCaptions, osd_msg);
12      else if (vbimode == VBIMode::PAL_TT)
13          EnableCaptions(kDisplayNUVTeletextCaptions, osd_msg);
14!     else if (vbimode == VBIMode::NTSC_CC)
15!     {
16!         if (decoder->GetTrackCount(kTrackTypeCC608))
17!             EnableCaptions(kDisplayCC608, osd_msg);
18!         else
19!             captions_found = false;
20!     }
21      else
22          captions_found = false;
23 
24--- 1653,1666 ----
25          EnableCaptions(kDisplayAVSubtitle, osd_msg);
26      else if (textSubtitles.GetSubtitleCount() > 0)
27          EnableCaptions(kDisplayTextSubtitle, osd_msg);
28      else if (decoder->GetTrackCount(kTrackTypeTeletextCaptions))
29          EnableCaptions(kDisplayTeletextCaptions, osd_msg);
30      else if (vbimode == VBIMode::PAL_TT)
31          EnableCaptions(kDisplayNUVTeletextCaptions, osd_msg);
32!     else if (decoder->GetTrackCount(kTrackTypeCC608))
33!         EnableCaptions(kDisplayCC608, osd_msg);
34!     else if (decoder->GetTrackCount(kTrackTypeCC708))
35!         EnableCaptions(kDisplayCC708, osd_msg);
36      else
37          captions_found = false;
38