Ticket #2716: subtitle_not_displaying.diff

DVDRingBuffer.cpp

@@ -701 +709 @@
     if (buf_size < 4)
         return false;
 
+    bool force_subtitle_display = false;
     sub->rects = NULL;
     sub->num_rects = 0;
     sub->start_display_time = 0;
@@ -721 +730 @@
             switch(cmd) 
             {
                 case 0x00:
+                    force_subtitle_display = true;
                 break;  
                 case 0x01:
                     sub->start_display_time = (date << 10) / 90;
@@ -837 +849 @@
         cmd_pos = next_cmd_pos;
     }
     if (sub->num_rects > 0)
+    {
+        if (parent && curSubtitleTrack == -1 && !IsInMenu())
+        {
+            uint captionmode = parent->GetCaptionMode();
+            if (force_subtitle_display && captionmode != kDisplayAVSubtitle)
+                parent->SetCaptionsEnabled(true, false);
+            else if (!force_subtitle_display && captionmode == kDisplayAVSubtitle)
+                parent->SetCaptionsEnabled(false, false);
+        }
         return true;
+    }
 fail:
     return false;
 }