C++11 tidying.

[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 3ed4a6827f98cf41c025bade2c2b54a4712a0710..024d62f3424f3138f2f84f190e5f99119d4a8984 100644 (file)
--- a/src/lib/dcp_subtitle_decoder.cc
+++ b/src/lib/dcp_subtitle_decoder.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014-2018 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,20 +18,31 @@
 
 */
 
+
 #include "dcp_subtitle_decoder.h"
 #include "dcp_subtitle_content.h"
 #include <dcp/interop_subtitle_asset.h>
+#include <dcp/load_font_node.h>
 #include <iostream>
 
-using std::list;
+
 using std::cout;
-using boost::shared_ptr;
-using boost::dynamic_pointer_cast;
+using std::list;
+using std::map;
+using std::string;
+using std::vector;
+using std::shared_ptr;
+using std::dynamic_pointer_cast;
+using std::make_shared;
 using boost::bind;
+using namespace dcpomatic;
+
 
-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)));
+       auto c = load (content->path(0));
+       c->fix_empty_font_ids ();
        _subtitles = c->subtitles ();
        _next = _subtitles.begin ();
 
@@ -39,21 +50,35 @@ DCPSubtitleDecoder::DCPSubtitleDecoder (shared_ptr<const DCPSubtitleContent> con
        if (_next != _subtitles.end()) {
                first = content_time_period(*_next).from;
        }
-       caption.push_back (shared_ptr<CaptionDecoder> (new CaptionDecoder (this, content->only_caption(), log, first)));
+       text.push_back (make_shared<TextDecoder>(this, content->only_text(), first));
+
+       auto fm = c->font_data();
+       for (auto const& i: fm) {
+               _fonts.push_back (FontData(i.first, i.second));
+       }
+
+       /* Add a default font for any LoadFont nodes in our file which we haven't yet found fonts for */
+       for (auto i: c->load_font_nodes()) {
+               if (fm.find(i->id) == fm.end()) {
+                       _fonts.push_back (FontData(i->id, dcp::ArrayData(default_font_file())));
+               }
+       }
 }
 
+
 void
 DCPSubtitleDecoder::seek (ContentTime time, bool accurate)
 {
        Decoder::seek (time, accurate);
 
        _next = _subtitles.begin ();
-       list<shared_ptr<dcp::Subtitle> >::const_iterator i = _subtitles.begin ();
+       auto i = _subtitles.begin ();
        while (i != _subtitles.end() && ContentTime::from_seconds ((*_next)->in().as_seconds()) < time) {
                ++i;
        }
 }
 
+
 bool
 DCPSubtitleDecoder::pass ()
 {
@@ -63,33 +88,51 @@ 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;
-       ContentTimePeriod const p = content_time_period (*_next);
+       list<dcp::SubtitleImage> i;
+       auto const p = content_time_period (*_next);
 
        while (_next != _subtitles.end () && content_time_period (*_next) == p) {
-               shared_ptr<dcp::SubtitleString> ns = dynamic_pointer_cast<dcp::SubtitleString>(*_next);
+               auto ns = dynamic_pointer_cast<const dcp::SubtitleString>(*_next);
                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.
+                       */
+
+                       auto ni = dynamic_pointer_cast<const dcp::SubtitleImage>(*_next);
+                       if (ni) {
+                               emit_subtitle_image (p, *ni, film()->frame_size(), only_text());
+                               ++_next;
+                       }
                }
-
-               /* XXX: image subtitles */
        }
 
-       only_caption()->emit_plain (p, s);
+       only_text()->emit_plain (p, s);
        return false;
 }
 
+
 ContentTimePeriod
-DCPSubtitleDecoder::content_time_period (shared_ptr<dcp::Subtitle> s) const
+DCPSubtitleDecoder::content_time_period (shared_ptr<const dcp::Subtitle> s) const
 {
-       return ContentTimePeriod (
-               ContentTime::from_seconds (s->in().as_seconds ()),
-               ContentTime::from_seconds (s->out().as_seconds ())
-               );
+       return {
+               ContentTime::from_seconds(s->in().as_seconds()),
+               ContentTime::from_seconds(s->out().as_seconds())
+       };
 }
+
+
+vector<dcpomatic::FontData>
+DCPSubtitleDecoder::fonts () const
+{
+       return _fonts;
+}
+