Ticket #8153: external_subtitle_menu_v2.patch

libs/libmythtv/NuppelVideoPlayer.cpp

@@ -89 +89 @@
 #define LOC_WARN QString("NVP(%1), Warning: ").arg(dbg_ident(this),0,36)
 #define LOC_ERR  QString("NVP(%1), Error: ").arg(dbg_ident(this),0,36)
 
-uint track_type_to_display_mode[kTrackTypeCount+2] =
+uint track_type_to_display_mode[kTrackTypeCount+3] =
 {
     kDisplayNone,
     kDisplayAVSubtitle,
@@ -98 +98 @@
     kDisplayTeletextCaptions,
     kDisplayNone,
     kDisplayNUVTeletextCaptions,
+    kDisplayTextSubtitle,
 };
 
 NuppelVideoPlayer::NuppelVideoPlayer(bool muted)
@@ -1928 +1929 @@
 
     // figure out which text type to enable..
     bool captions_found = true;
-    if (decoder->GetTrackCount(kTrackTypeSubtitle))
+    if (textSubtitles.GetSubtitleCount() > 0)
+        EnableCaptions(kDisplayTextSubtitle, osd_msg);
+    else if (decoder->GetTrackCount(kTrackTypeSubtitle))
         EnableCaptions(kDisplayAVSubtitle, osd_msg);
-    else if (textSubtitles.GetSubtitleCount() > 0)
-        EnableCaptions(kDisplayTextSubtitle, osd_msg);
     else if (db_prefer708 && decoder->GetTrackCount(kTrackTypeCC708))
         EnableCaptions(kDisplayCC708, osd_msg);
     else if (decoder->GetTrackCount(kTrackTypeTeletextCaptions))
@@ -6754 +6755 @@
     if (kTrackTypeSubtitle == type)
     {
         DisableCaptions(textDisplayMode, false);
-        EnableCaptions(kDisplayAVSubtitle);
+        EnableCaptions(GetTextSubtitlesCount() > 0 ?
+                       kDisplayTextSubtitle : kDisplayAVSubtitle);
     }
     else if (kTrackTypeCC708 == type)
     {
@@ -6898 +6900 @@
 
 int NuppelVideoPlayer::ChangeTrack(uint type, int dir)
 {
+    if (type == kTrackTypeSubtitle && GetTextSubtitlesCount() > 0)
+        return SetTrack(type, 0);
     QMutexLocker locker(&decoder_change_lock);
 
     if (GetDecoder())

libs/libmythtv/NuppelVideoPlayer.h

@@ -418 +418 @@
     bool PosMapFromEnc(unsigned long long          start,
                        QMap<long long, long long> &posMap);
 
+    uint GetTextSubtitlesCount(void) const
+    {
+        return textSubtitles.GetSubtitleCount();
+    }
+
   protected:
     void DisplayPauseFrame(void);
     void DisplayNormalFrame(void);

libs/libmythtv/tv_play.cpp

@@ -3470 +3470 @@
     else if (action.left(6) == "TOGGLE")
     {
         int type = to_track_type(action.mid(6));
+        if (type == kTrackTypeSubtitle &&
+            ctx->nvp->GetTextSubtitlesCount() > 0)
+            type = kTrackTypeTextSubtitle;
         if (type == kTrackTypeTeletextMenu)
         {
             handled = true;
@@ -10811 +10814 @@
         typeStr = "SUBTITLE";
         selStr  = "SELECTSUBTITLE_";
         grpStr  = "SUBTITLEGROUP";
-        sel     = capmode & kDisplayAVSubtitle;
+        sel     = capmode & (kDisplayAVSubtitle | kDisplayTextSubtitle);
     }
     else if (kTrackTypeCC608 == type)
     {
@@ -10854 +10857 @@
     }
     ctx->UnlockDeleteNVP(__FILE__, __LINE__);
 
-    if (tracks.empty())
+    if (tracks.empty() &&
+        !(type == kTrackTypeSubtitle && ctx->nvp->GetTextSubtitlesCount() > 0))
         return false;
 
     if ((kTrackTypeAudio == type) && tracks.size() <= 1)
@@ -10873 +10877 @@
             (sel && (i == curtrack)) ? 1 : 0, NULL, grpStr);
     }
 
+    if (type == kTrackTypeSubtitle && ctx->nvp->GetTextSubtitlesCount() > 0)
+    {
+        new OSDGenericTree(
+            tm_item, QObject::tr("Text Subtitles"), selStr + QString::number(1),
+            sel ? 1 : 0, NULL, grpStr);
+    }
+
     return true;
 }