X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp_subtitle_content.cc;h=a6cfd8d93a42c1ebbe4e5f46695ad94bcda139a3;hb=182b9d2e2feb6545592868606aaf0f0146095481;hp=54bd631cb6586a03dc7ee15c9831193e78c78e56;hpb=673ba43fb66eb0dee43807501753749f144254a7;p=dcpomatic.git

diff --git a/src/lib/dcp_subtitle_content.cc b/src/lib/dcp_subtitle_content.cc
index 54bd631cb..a6cfd8d93 100644
--- 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,18 @@ 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 ();
 
-	BOOST_FOREACH (shared_ptr<dcp::LoadFontNode> i, sc->load_font_nodes ()) {
-		only_text()->add_font (shared_ptr<Font> (new Font (i->id)));
+	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));
+		}
 	}
 }