Ticket #8153: external_subtitle_menu.patch
File external_subtitle_menu.patch, 2.1 KB (added by , 14 years ago) |
---|
-
libs/libmythtv/NuppelVideoPlayer.cpp
89 89 #define LOC_WARN QString("NVP(%1), Warning: ").arg(dbg_ident(this),0,36) 90 90 #define LOC_ERR QString("NVP(%1), Error: ").arg(dbg_ident(this),0,36) 91 91 92 uint track_type_to_display_mode[kTrackTypeCount+ 2] =92 uint track_type_to_display_mode[kTrackTypeCount+3] = 93 93 { 94 94 kDisplayNone, 95 95 kDisplayAVSubtitle, … … 98 98 kDisplayTeletextCaptions, 99 99 kDisplayNone, 100 100 kDisplayNUVTeletextCaptions, 101 kDisplayTextSubtitle, 101 102 }; 102 103 103 104 NuppelVideoPlayer::NuppelVideoPlayer(bool muted) -
libs/libmythtv/NuppelVideoPlayer.h
418 418 bool PosMapFromEnc(unsigned long long start, 419 419 QMap<long long, long long> &posMap); 420 420 421 uint GetTextSubtitlesCount(void) const 422 { 423 return textSubtitles.GetSubtitleCount(); 424 } 425 421 426 protected: 422 427 void DisplayPauseFrame(void); 423 428 void DisplayNormalFrame(void); -
libs/libmythtv/tv_play.cpp
3470 3470 else if (action.left(6) == "TOGGLE") 3471 3471 { 3472 3472 int type = to_track_type(action.mid(6)); 3473 if (type == kTrackTypeSubtitle && 3474 ctx->nvp->GetTextSubtitlesCount() > 0) 3475 type = kTrackTypeTextSubtitle; 3473 3476 if (type == kTrackTypeTeletextMenu) 3474 3477 { 3475 3478 handled = true; … … 10854 10857 } 10855 10858 ctx->UnlockDeleteNVP(__FILE__, __LINE__); 10856 10859 10857 if (tracks.empty()) 10860 if (tracks.empty() && 10861 !(type == kTrackTypeSubtitle && ctx->nvp->GetTextSubtitlesCount() > 0)) 10858 10862 return false; 10859 10863 10860 10864 if ((kTrackTypeAudio == type) && tracks.size() <= 1)