Fix font_id_map errors when importing DCP subtitles that have no

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

diff --git a/src/lib/dcp_subtitle_content.cc b/src/lib/dcp_subtitle_content.cc
index d25e06188b95de79ab189e9cbc03b1a8af5adad2..b111bdb2a242b9aee2ba7ecb4730a61418bd4368 100644 (file)
--- a/src/lib/dcp_subtitle_content.cc
+++ b/src/lib/dcp_subtitle_content.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.
 
@@ -27,27 +27,29 @@
 #include <dcp/smpte_subtitle_asset.h>
 #include <dcp/interop_load_font_node.h>
 #include <libxml++/libxml++.h>
-#include <boost/foreach.hpp>
 
 #include "i18n.h"
 
-using std::string;
+using std::dynamic_pointer_cast;
 using std::list;
-using boost::shared_ptr;
-using boost::dynamic_pointer_cast;
+using std::make_shared;
+using std::shared_ptr;
+using std::string;
 using dcp::raw_convert;
+using namespace dcpomatic;
 
 DCPSubtitleContent::DCPSubtitleContent (boost::filesystem::path path)
        : Content (path)
 {
-       text.push_back (shared_ptr<TextContent> (new TextContent (this, TEXT_OPEN_SUBTITLE, TEXT_OPEN_SUBTITLE)));
+       text.push_back (make_shared<TextContent>(this, TextType::OPEN_SUBTITLE, TextType::OPEN_SUBTITLE));
 }
 
 DCPSubtitleContent::DCPSubtitleContent (cxml::ConstNodePtr node, int version)
        : Content (node)
        , _length (node->number_child<ContentTime::Type> ("Length"))
 {
-       text = TextContent::from_xml (this, node, version);
+       list<string> notes;
+       text = TextContent::from_xml (this, node, version, notes);
 }
 
 void
@@ -55,10 +57,10 @@ DCPSubtitleContent::examine (shared_ptr<const Film> film, shared_ptr<Job> job)
 {
        Content::examine (film, job);
 
-       shared_ptr<dcp::SubtitleAsset> sc = load (path (0));
+       auto sc = load (path(0));
 
-       shared_ptr<dcp::InteropSubtitleAsset> iop = dynamic_pointer_cast<dcp::InteropSubtitleAsset> (sc);
-       shared_ptr<dcp::SMPTESubtitleAsset> smpte = dynamic_pointer_cast<dcp::SMPTESubtitleAsset> (sc);
+       auto iop = dynamic_pointer_cast<dcp::InteropSubtitleAsset>(sc);
+       auto smpte = dynamic_pointer_cast<dcp::SMPTESubtitleAsset>(sc);
        if (smpte) {
                set_video_frame_rate (smpte->edit_rate().numerator);
        }
@@ -68,16 +70,22 @@ DCPSubtitleContent::examine (shared_ptr<const Film> film, shared_ptr<Job> job)
        /* Default to turning these subtitles on */
        only_text()->set_use (true);
 
-       if (iop) {
-               only_text()->set_language (iop->language ());
-       } else if (smpte) {
-               only_text()->set_language (smpte->language().get_value_or (""));
-       }
+       _length = ContentTime::from_seconds (sc->latest_subtitle_out().as_seconds());
 
-       _length = ContentTime::from_seconds (sc->latest_subtitle_out().as_seconds ());
+       sc->fix_empty_font_ids ();
+
+       auto font_data = sc->font_data();
+       for (auto node: sc->load_font_nodes()) {
+               auto data = font_data.find(node->id);
+               if (data != font_data.end()) {
+                       only_text()->add_font(make_shared<Font>(node->id, data->second));
+               } else {
+                       only_text()->add_font(make_shared<Font>(node->id));
+               }
+       }
 
-       BOOST_FOREACH (shared_ptr<dcp::LoadFontNode> i, sc->load_font_nodes ()) {
-               only_text()->add_font (shared_ptr<Font> (new Font (i->id)));
+       if (only_text()->fonts().empty()) {
+               only_text()->add_font(make_shared<Font>(""));
        }
 }
 
@@ -88,6 +96,12 @@ DCPSubtitleContent::full_length (shared_ptr<const Film> film) const
        return DCPTime (_length, frc);
 }
 
+DCPTime
+DCPSubtitleContent::approximate_length () const
+{
+       return DCPTime (_length, FrameRateChange());
+}
+
 string
 DCPSubtitleContent::summary () const
 {