Stop empty Font IDs in imported DCP subtitles making it into the

[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 c7a9a863f038b5993688bd5a0b7ccb0695c88dbe..e76004c2ce50bea1de5cdc7066617de78e10a5d6 100644 (file)
--- a/src/lib/dcp_subtitle_decoder.cc
+++ b/src/lib/dcp_subtitle_decoder.cc
@@ -29,9 +29,11 @@ using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
 using boost::bind;
 
-DCPSubtitleDecoder::DCPSubtitleDecoder (shared_ptr<const DCPSubtitleContent> content, shared_ptr<Log> log)
+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 ();
 
@@ -39,7 +41,7 @@ DCPSubtitleDecoder::DCPSubtitleDecoder (shared_ptr<const DCPSubtitleContent> con
        if (_next != _subtitles.end()) {
                first = content_time_period(*_next).from;
        }
-       caption.reset (new CaptionDecoder (this, content->caption, log, first));
+       text.push_back (shared_ptr<TextDecoder> (new TextDecoder (this, content->only_text(), first)));
 }
 
 void
@@ -63,12 +65,13 @@ DCPSubtitleDecoder::pass ()
 
        /* Gather all subtitles with the same time period that are next
           on the list.  We must emit all subtitles for the same time
-          period with the same plain_text() call otherwise the
-          CaptionDecoder will assume there is nothing else at the
-          time of emit the first.
+          period with the same emit*() call otherwise the
+          TextDecoder will assume there is nothing else at the
+          time of emitting the first.
        */
 
        list<dcp::SubtitleString> s;
+       list<dcp::SubtitleImage> i;
        ContentTimePeriod const p = content_time_period (*_next);
 
        while (_next != _subtitles.end () && content_time_period (*_next) == p) {
@@ -76,12 +79,20 @@ DCPSubtitleDecoder::pass ()
                if (ns) {
                        s.push_back (*ns);
                        ++_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;
+                       }
                }
-
-               /* XXX: image subtitles */
        }
 
-       caption->emit_plain (p, s);
+       only_text()->emit_plain (p, s);
        return false;
 }