Remove our forcing of analyzeduration and probesize as they seem to

[dcpomatic.git] / src / lib / dcp_subtitle_decoder.cc

diff --git a/src/lib/dcp_subtitle_decoder.cc b/src/lib/dcp_subtitle_decoder.cc
index 5d5e1f6311019dc5269b3f7f29856629fa65d6ac..f34c495c0eb03eaf3621ae1b533e70b958b6bc6e 100644 (file)
--- a/src/lib/dcp_subtitle_decoder.cc
+++ b/src/lib/dcp_subtitle_decoder.cc
@@ -28,11 +28,13 @@ using std::cout;
 using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
 using boost::bind;
+using namespace dcpomatic;
 
 DCPSubtitleDecoder::DCPSubtitleDecoder (shared_ptr<const Film> film, shared_ptr<const DCPSubtitleContent> content)
        : Decoder (film)
 {
        shared_ptr<dcp::SubtitleAsset> c (load (content->path (0)));
+       c->fix_empty_font_ids ();
        _subtitles = c->subtitles ();
        _next = _subtitles.begin ();
 
@@ -78,16 +80,16 @@ DCPSubtitleDecoder::pass ()
                if (ns) {
                        s.push_back (*ns);
                        ++_next;
-               }
-
-               /* XXX: perhaps these image subs should also be collected together like the string ones are;
-                  this would need to be done both here and in DCPDecoder.
-               */
-
-               shared_ptr<dcp::SubtitleImage> ni = dynamic_pointer_cast<dcp::SubtitleImage>(*_next);
-               if (ni) {
-                       emit_subtitle_image (p, *ni, film()->frame_size(), only_text());
-                       ++_next;
+               } else {
+                       /* XXX: perhaps these image subs should also be collected together like the string ones are;
+                          this would need to be done both here and in DCPDecoder.
+                       */
+
+                       shared_ptr<dcp::SubtitleImage> ni = dynamic_pointer_cast<dcp::SubtitleImage>(*_next);
+                       if (ni) {
+                               emit_subtitle_image (p, *ni, film()->frame_size(), only_text());
+                               ++_next;
+                       }
                }
        }