X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fdcp_content.cc;h=87e59de50bc7ca27a14bfcde1d39b109b4e45429;hp=e43d88a3472b2050f139c784c742611ee94d7419;hb=550794a2a289c4d738292ab74639e1496f55e07e;hpb=a5d004b0773f633401528392fc28e66d70e13ac8

diff --git a/src/lib/dcp_content.cc b/src/lib/dcp_content.cc
index e43d88a34..87e59de50 100644
--- a/src/lib/dcp_content.cc
+++ b/src/lib/dcp_content.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014-2020 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2023 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,20 +18,22 @@
 
 */
 
+
 #include "atmos_content.h"
-#include "dcp_content.h"
-#include "video_content.h"
 #include "audio_content.h"
-#include "dcp_examiner.h"
-#include "job.h"
-#include "film.h"
-#include "config.h"
-#include "overlaps.h"
 #include "compose.hpp"
+#include "config.h"
+#include "dcp_content.h"
 #include "dcp_decoder.h"
-#include "log.h"
+#include "dcp_examiner.h"
 #include "dcpomatic_log.h"
+#include "film.h"
+#include "job.h"
+#include "log.h"
+#include "overlaps.h"
+#include "scope_guard.h"
 #include "text_content.h"
+#include "video_content.h"
 #include <dcp/dcp.h>
 #include <dcp/raw_convert.h>
 #include <dcp/exceptions.h>
@@ -45,24 +47,24 @@
 
 #include "i18n.h"
 
-using std::string;
+
 using std::cout;
-using std::distance;
-using std::pair;
-using std::vector;
+using std::dynamic_pointer_cast;
+using std::function;
 using std::list;
-using std::map;
+using std::make_shared;
 using std::shared_ptr;
-using boost::scoped_ptr;
+using std::string;
+using std::vector;
 using boost::optional;
-using boost::function;
-using std::dynamic_pointer_cast;
+using boost::scoped_ptr;
 #if BOOST_VERSION >= 106100
 using namespace boost::placeholders;
 #endif
 using dcp::raw_convert;
 using namespace dcpomatic;
 
+
 int const DCPContentProperty::NEEDS_ASSETS       = 600;
 int const DCPContentProperty::NEEDS_KDM          = 601;
 int const DCPContentProperty::REFERENCE_VIDEO    = 602;
@@ -72,6 +74,7 @@ int const DCPContentProperty::NAME               = 605;
 int const DCPContentProperty::TEXTS              = 606;
 int const DCPContentProperty::CPL                = 607;
 
+
 DCPContent::DCPContent (boost::filesystem::path p)
 	: _encrypted (false)
 	, _needs_assets (false)
@@ -84,35 +87,27 @@ DCPContent::DCPContent (boost::filesystem::path p)
 
 	read_directory (p);
 	set_default_colour_conversion ();
-
-	for (int i = 0; i < TEXT_COUNT; ++i) {
-		_reference_text[i] = false;
-	}
 }
 
 DCPContent::DCPContent (cxml::ConstNodePtr node, int version)
 	: Content (node)
 {
-	video = VideoContent::from_xml (this, node, version);
+	video = VideoContent::from_xml (this, node, version, VideoRange::FULL);
 	audio = AudioContent::from_xml (this, node, version);
-	text = TextContent::from_xml (this, node, version);
+	list<string> notes;
+	text = TextContent::from_xml (this, node, version, notes);
 	atmos = AtmosContent::from_xml (this, node);
 
-	for (int i = 0; i < TEXT_COUNT; ++i) {
-		_reference_text[i] = false;
-	}
-
 	if (video && audio) {
 		audio->set_stream (
-			AudioStreamPtr (
-				new AudioStream (
-					node->number_child<int> ("AudioFrameRate"),
-					/* AudioLength was not present in some old metadata versions */
-					node->optional_number_child<Frame>("AudioLength").get_value_or (
-						video->length() * node->number_child<int>("AudioFrameRate") / video_frame_rate().get()
-						),
-					AudioMapping (node->node_child ("AudioMapping"), version)
-					)
+			make_shared<AudioStream> (
+				node->number_child<int> ("AudioFrameRate"),
+				/* AudioLength was not present in some old metadata versions */
+				node->optional_number_child<Frame>("AudioLength").get_value_or (
+					video->length() * node->number_child<int>("AudioFrameRate") / video_frame_rate().get()
+					),
+				AudioMapping(node->node_child("AudioMapping"), version),
+				24
 				)
 			);
 	}
@@ -127,27 +122,27 @@ DCPContent::DCPContent (cxml::ConstNodePtr node, int version)
 	_reference_video = node->optional_bool_child ("ReferenceVideo").get_value_or (false);
 	_reference_audio = node->optional_bool_child ("ReferenceAudio").get_value_or (false);
 	if (version >= 37) {
-		_reference_text[TEXT_OPEN_SUBTITLE] = node->optional_bool_child("ReferenceOpenSubtitle").get_value_or(false);
-		_reference_text[TEXT_CLOSED_CAPTION] = node->optional_bool_child("ReferenceClosedCaption").get_value_or(false);
+		_reference_text[TextType::OPEN_SUBTITLE] = node->optional_bool_child("ReferenceOpenSubtitle").get_value_or(false);
+		_reference_text[TextType::CLOSED_CAPTION] = node->optional_bool_child("ReferenceClosedCaption").get_value_or(false);
 	} else {
-		_reference_text[TEXT_OPEN_SUBTITLE] = node->optional_bool_child("ReferenceSubtitle").get_value_or(false);
-		_reference_text[TEXT_CLOSED_CAPTION] = false;
+		_reference_text[TextType::OPEN_SUBTITLE] = node->optional_bool_child("ReferenceSubtitle").get_value_or(false);
+		_reference_text[TextType::CLOSED_CAPTION] = false;
 	}
 	if (node->optional_string_child("Standard")) {
-		string const s = node->optional_string_child("Standard").get();
+		auto const s = node->optional_string_child("Standard").get();
 		if (s == "Interop") {
-			_standard = dcp::INTEROP;
+			_standard = dcp::Standard::INTEROP;
 		} else if (s == "SMPTE") {
-			_standard = dcp::SMPTE;
+			_standard = dcp::Standard::SMPTE;
 		} else {
 			DCPOMATIC_ASSERT (false);
 		}
 	}
 	_three_d = node->optional_bool_child("ThreeD").get_value_or (false);
 
-	optional<string> ck = node->optional_string_child("ContentKind");
+	auto ck = node->optional_string_child("ContentKind");
 	if (ck) {
-		_content_kind = dcp::content_kind_from_string (*ck);
+		_content_kind = dcp::ContentKind::from_name(*ck);
 	}
 	_cpl = node->optional_string_child("CPL");
 	for (auto i: node->node_children("ReelLength")) {
@@ -175,10 +170,10 @@ DCPContent::read_directory (boost::filesystem::path p)
 	bool have_assetmap = false;
 	bool have_metadata = false;
 
-	for (directory_iterator i(p); i != directory_iterator(); ++i) {
-		if (i->path().filename() == "ASSETMAP" || i->path().filename() == "ASSETMAP.xml") {
+	for (auto i: directory_iterator(p)) {
+		if (i.path().filename() == "ASSETMAP" || i.path().filename() == "ASSETMAP.xml") {
 			have_assetmap = true;
-		} else if (i->path().filename() == "metadata.xml") {
+		} else if (i.path().filename() == "metadata.xml") {
 			have_metadata = true;
 		}
 	}
@@ -187,10 +182,7 @@ DCPContent::read_directory (boost::filesystem::path p)
 		if (!have_metadata) {
 			throw DCPError ("No ASSETMAP or ASSETMAP.xml file found: is this a DCP?");
 		} else {
-			throw DCPError (
-				"This looks like a DCP-o-matic project folder, which cannot be added to a different project.  "
-				"Choose the DCP directory inside the DCP-o-matic project folder if that's what you want to import."
-				);
+			throw ProjectFolderError ();
 		}
 	}
 
@@ -200,14 +192,18 @@ DCPContent::read_directory (boost::filesystem::path p)
 void
 DCPContent::read_sub_directory (boost::filesystem::path p)
 {
+	using namespace boost::filesystem;
+
 	LOG_GENERAL ("DCPContent::read_sub_directory reads %1", p.string());
-	for (boost::filesystem::directory_iterator i(p); i != boost::filesystem::directory_iterator(); ++i) {
-		if (boost::filesystem::is_regular_file (i->path())) {
-			LOG_GENERAL ("Inside there's regular file %1", i->path().string());
-			add_path (i->path());
-		} else if (boost::filesystem::is_directory (i->path ())) {
-			LOG_GENERAL ("Inside there's directory %1", i->path().string());
-			read_sub_directory (i->path());
+	for (auto i: directory_iterator(p)) {
+		if (is_regular_file(i.path())) {
+			LOG_GENERAL ("Inside there's regular file %1", i.path().string());
+			add_path (i.path());
+		} else if (is_directory(i.path()) && i.path().filename() != ".AppleDouble") {
+			LOG_GENERAL ("Inside there's directory %1", i.path().string());
+			read_sub_directory (i.path());
+		} else {
+			LOG_GENERAL("Ignoring %1 from inside: status is %2", i.path().string(), static_cast<int>(status(i.path()).type()));
 		}
 	}
 }
@@ -220,35 +216,40 @@ DCPContent::examine (shared_ptr<const Film> film, shared_ptr<Job> job)
 	bool const needed_kdm = needs_kdm ();
 	string const old_name = name ();
 
-	ChangeSignaller<Content> cc_texts (this, DCPContentProperty::TEXTS);
-	ChangeSignaller<Content> cc_assets (this, DCPContentProperty::NEEDS_ASSETS);
-	ChangeSignaller<Content> cc_kdm (this, DCPContentProperty::NEEDS_KDM);
-	ChangeSignaller<Content> cc_name (this, DCPContentProperty::NAME);
+	ContentChangeSignalDespatcher::instance()->suspend();
+	ScopeGuard sg = []() {
+		ContentChangeSignalDespatcher::instance()->resume();
+	};
+
+	ContentChangeSignaller cc_texts (this, DCPContentProperty::TEXTS);
+	ContentChangeSignaller cc_assets (this, DCPContentProperty::NEEDS_ASSETS);
+	ContentChangeSignaller cc_kdm (this, DCPContentProperty::NEEDS_KDM);
+	ContentChangeSignaller cc_name (this, DCPContentProperty::NAME);
 
 	if (job) {
 		job->set_progress_unknown ();
 	}
 	Content::examine (film, job);
 
-	shared_ptr<DCPExaminer> examiner (new DCPExaminer(shared_from_this(), film ? film->tolerant() : true));
+	auto examiner = make_shared<DCPExaminer>(shared_from_this(), film ? film->tolerant() : true);
 
 	if (examiner->has_video()) {
 		{
 			boost::mutex::scoped_lock lm (_mutex);
-			video.reset (new VideoContent (this));
+			video = make_shared<VideoContent>(this);
 		}
-		video->take_from_examiner (examiner);
+		video->take_from_examiner(film, examiner);
 		set_default_colour_conversion ();
 	}
 
 	if (examiner->has_audio()) {
 		{
 			boost::mutex::scoped_lock lm (_mutex);
-			audio.reset (new AudioContent (this));
+			audio = make_shared<AudioContent>(this);
 		}
-		AudioStreamPtr as (new AudioStream (examiner->audio_frame_rate(), examiner->audio_length(), examiner->audio_channels()));
+		auto as = make_shared<AudioStream>(examiner->audio_frame_rate(), examiner->audio_length(), examiner->audio_channels(), 24);
 		audio->set_stream (as);
-		AudioMapping m = as->mapping ();
+		auto m = as->mapping ();
 		m.make_default (film ? film->audio_processor() : 0);
 		as->set_mapping (m);
 	}
@@ -256,7 +257,7 @@ DCPContent::examine (shared_ptr<const Film> film, shared_ptr<Job> job)
 	if (examiner->has_atmos()) {
 		{
 			boost::mutex::scoped_lock lm (_mutex);
-			atmos.reset (new AtmosContent(this));
+			atmos = make_shared<AtmosContent>(this);
 		}
 		/* Setting length will cause calculations to be made based on edit rate, so that must
 		 * be set up first otherwise hard-to-spot exceptions will be thrown.
@@ -265,15 +266,20 @@ DCPContent::examine (shared_ptr<const Film> film, shared_ptr<Job> job)
 		atmos->set_length (examiner->atmos_length());
 	}
 
-	list<shared_ptr<TextContent> > new_text;
-	for (int i = 0; i < TEXT_COUNT; ++i) {
-		for (int j = 0; j < examiner->text_count(static_cast<TextType>(i)); ++j) {
-			shared_ptr<TextContent> c(new TextContent(this, static_cast<TextType>(i), static_cast<TextType>(i)));
-			if (i == TEXT_CLOSED_CAPTION) {
-				c->set_dcp_track (examiner->dcp_text_track(j));
-			}
-			new_text.push_back (c);
-		}
+	vector<shared_ptr<TextContent>> new_text;
+
+	for (int i = 0; i < examiner->text_count(TextType::OPEN_SUBTITLE); ++i) {
+		auto c = make_shared<TextContent>(this, TextType::OPEN_SUBTITLE, TextType::OPEN_SUBTITLE);
+		c->set_language (examiner->open_subtitle_language());
+		add_fonts_from_examiner(c, examiner->fonts());
+		new_text.push_back (c);
+	}
+
+	for (int i = 0; i < examiner->text_count(TextType::CLOSED_CAPTION); ++i) {
+		auto c = make_shared<TextContent>(this, TextType::CLOSED_CAPTION, TextType::CLOSED_CAPTION);
+		c->set_dcp_track (examiner->dcp_text_track(i));
+		add_fonts_from_examiner(c, examiner->fonts());
+		new_text.push_back (c);
 	}
 
 	{
@@ -288,9 +294,8 @@ DCPContent::examine (shared_ptr<const Film> film, shared_ptr<Job> job)
 		_content_kind = examiner->content_kind ();
 		_cpl = examiner->cpl ();
 		_reel_lengths = examiner->reel_lengths ();
-		map<dcp::Marker, dcp::Time> markers = examiner->markers();
-		for (map<dcp::Marker, dcp::Time>::const_iterator i = markers.begin(); i != markers.end(); ++i) {
-			_markers[i->first] = ContentTime(i->second.as_editable_units(DCPTime::HZ));
+		for (auto const& i: examiner->markers()) {
+			_markers[i.first] = ContentTime(i.second.as_editable_units_ceil(DCPTime::HZ));
 		}
 		_ratings = examiner->ratings ();
 		_content_versions = examiner->content_versions ();
@@ -309,7 +314,7 @@ DCPContent::examine (shared_ptr<const Film> film, shared_ptr<Job> job)
 	}
 
 	if (video) {
-		video->set_frame_type (_three_d ? VIDEO_FRAME_TYPE_3D : VIDEO_FRAME_TYPE_2D);
+		video->set_frame_type (_three_d ? VideoFrameType::THREE_D : VideoFrameType::TWO_D);
 	}
 }
 
@@ -369,14 +374,14 @@ DCPContent::as_xml (xmlpp::Node* node, bool with_paths) const
 	node->add_child("KDMValid")->add_child_text (_kdm_valid ? "1" : "0");
 	node->add_child("ReferenceVideo")->add_child_text (_reference_video ? "1" : "0");
 	node->add_child("ReferenceAudio")->add_child_text (_reference_audio ? "1" : "0");
-	node->add_child("ReferenceOpenSubtitle")->add_child_text(_reference_text[TEXT_OPEN_SUBTITLE] ? "1" : "0");
-	node->add_child("ReferenceClosedCaption")->add_child_text(_reference_text[TEXT_CLOSED_CAPTION] ? "1" : "0");
+	node->add_child("ReferenceOpenSubtitle")->add_child_text(_reference_text[TextType::OPEN_SUBTITLE] ? "1" : "0");
+	node->add_child("ReferenceClosedCaption")->add_child_text(_reference_text[TextType::CLOSED_CAPTION] ? "1" : "0");
 	if (_standard) {
 		switch (_standard.get ()) {
-		case dcp::INTEROP:
+		case dcp::Standard::INTEROP:
 			node->add_child("Standard")->add_child_text ("Interop");
 			break;
-		case dcp::SMPTE:
+		case dcp::Standard::SMPTE:
 			node->add_child("Standard")->add_child_text ("SMPTE");
 			break;
 		default:
@@ -385,7 +390,7 @@ DCPContent::as_xml (xmlpp::Node* node, bool with_paths) const
 	}
 	node->add_child("ThreeD")->add_child_text (_three_d ? "1" : "0");
 	if (_content_kind) {
-		node->add_child("ContentKind")->add_child_text(dcp::content_kind_to_string(*_content_kind));
+		node->add_child("ContentKind")->add_child_text(_content_kind->name());
 	}
 	if (_cpl) {
 		node->add_child("CPL")->add_child_text (_cpl.get ());
@@ -394,14 +399,14 @@ DCPContent::as_xml (xmlpp::Node* node, bool with_paths) const
 		node->add_child("ReelLength")->add_child_text (raw_convert<string> (i));
 	}
 
-	for (map<dcp::Marker, ContentTime>::const_iterator i = _markers.begin(); i != _markers.end(); ++i) {
-		xmlpp::Element* marker = node->add_child("Marker");
-		marker->set_attribute("type", dcp::marker_to_string(i->first));
-		marker->add_child_text(raw_convert<string>(i->second.get()));
+	for (auto const& i: _markers) {
+		auto marker = node->add_child("Marker");
+		marker->set_attribute("type", dcp::marker_to_string(i.first));
+		marker->add_child_text(raw_convert<string>(i.second.get()));
 	}
 
 	for (auto i: _ratings) {
-		xmlpp::Element* rating = node->add_child("Rating");
+		auto rating = node->add_child("Rating");
 		i.as_xml (rating);
 	}
 
@@ -414,7 +419,7 @@ DCPTime
 DCPContent::full_length (shared_ptr<const Film> film) const
 {
 	if (!video) {
-		return DCPTime();
+		return {};
 	}
 	FrameRateChange const frc (film, shared_from_this());
 	return DCPTime::from_frames (llrint(video->length() * frc.factor()), film->video_frame_rate());
@@ -424,7 +429,7 @@ DCPTime
 DCPContent::approximate_length () const
 {
 	if (!video) {
-		return DCPTime();
+		return {};
 	}
 	return DCPTime::from_frames (video->length(), 24);
 }
@@ -443,8 +448,8 @@ DCPContent::identifier () const
 	}
 
 	s += string (_reference_video ? "1" : "0");
-	for (int i = 0; i < TEXT_COUNT; ++i) {
-		s += string (_reference_text[i] ? "1" : "0");
+	for (auto text: _reference_text) {
+		s += string(text ? "1" : "0");
 	}
 	return s;
 }
@@ -511,7 +516,7 @@ DCPContent::set_default_colour_conversion ()
 void
 DCPContent::set_reference_video (bool r)
 {
-	ChangeSignaller<Content> cc (this, DCPContentProperty::REFERENCE_VIDEO);
+	ContentChangeSignaller cc (this, DCPContentProperty::REFERENCE_VIDEO);
 
 	{
 		boost::mutex::scoped_lock lm (_mutex);
@@ -522,7 +527,7 @@ DCPContent::set_reference_video (bool r)
 void
 DCPContent::set_reference_audio (bool r)
 {
-	ChangeSignaller<Content> cc (this, DCPContentProperty::REFERENCE_AUDIO);
+	ContentChangeSignaller cc (this, DCPContentProperty::REFERENCE_AUDIO);
 
 	{
 		boost::mutex::scoped_lock lm (_mutex);
@@ -533,7 +538,7 @@ DCPContent::set_reference_audio (bool r)
 void
 DCPContent::set_reference_text (TextType type, bool r)
 {
-	ChangeSignaller<Content> cc (this, DCPContentProperty::REFERENCE_TEXT);
+	ContentChangeSignaller cc (this, DCPContentProperty::REFERENCE_TEXT);
 
 	{
 		boost::mutex::scoped_lock lm (_mutex);
@@ -544,8 +549,8 @@ DCPContent::set_reference_text (TextType type, bool r)
 list<DCPTimePeriod>
 DCPContent::reels (shared_ptr<const Film> film) const
 {
-	list<int64_t> reel_lengths = _reel_lengths;
-	if (reel_lengths.empty ()) {
+	auto reel_lengths = _reel_lengths;
+	if (reel_lengths.empty()) {
 		/* Old metadata with no reel lengths; get them here instead */
 		try {
 			scoped_ptr<DCPExaminer> examiner (new DCPExaminer(shared_from_this(), film->tolerant()));
@@ -563,13 +568,13 @@ DCPContent::reels (shared_ptr<const Film> film) const
 	*/
 
 	/* The starting point of this content on the timeline */
-	DCPTime pos = position() - DCPTime (trim_start().get());
+	auto pos = position() - DCPTime (trim_start().get());
 
 	for (auto i: reel_lengths) {
 		/* This reel runs from `pos' to `to' */
 		DCPTime const to = pos + DCPTime::from_frames (i, film->video_frame_rate());
 		if (to > position()) {
-			p.push_back (DCPTimePeriod (max(position(), pos), min(end(film), to)));
+			p.push_back (DCPTimePeriod(max(position(), pos), min(end(film), to)));
 			if (to > end(film)) {
 				break;
 			}
@@ -595,11 +600,11 @@ DCPContent::can_reference (shared_ptr<const Film> film, function<bool (shared_pt
 {
 	/* We must be using the same standard as the film */
 	if (_standard) {
-		if (_standard.get() == dcp::INTEROP && !film->interop()) {
+		if (_standard.get() == dcp::Standard::INTEROP && !film->interop()) {
 			/// TRANSLATORS: this string will follow "Cannot reference this DCP: "
 			why_not = _("it is Interop and the film is set to SMPTE.");
 			return false;
-		} else if (_standard.get() == dcp::SMPTE && film->interop()) {
+		} else if (_standard.get() == dcp::Standard::SMPTE && film->interop()) {
 			/// TRANSLATORS: this string will follow "Cannot reference this DCP: "
 			why_not = _("it is SMPTE and the film is set to Interop.");
 			return false;
@@ -613,7 +618,7 @@ DCPContent::can_reference (shared_ptr<const Film> film, function<bool (shared_pt
 		return false;
 	}
 
-	list<DCPTimePeriod> const fr = film->reels ();
+	auto const fr = film->reels ();
 
 	list<DCPTimePeriod> reel_list;
 	try {
@@ -637,7 +642,7 @@ DCPContent::can_reference (shared_ptr<const Film> film, function<bool (shared_pt
 		}
 	}
 
-	ContentList a = overlaps (film, film->content(), part, position(), end(film));
+	auto a = overlaps (film, film->content(), part, position(), end(film));
 	if (a.size() != 1 || a.front().get() != this) {
 		why_not = overlapping;
 		return false;
@@ -661,7 +666,7 @@ DCPContent::can_reference_video (shared_ptr<const Film> film, string& why_not) c
 	}
 
 	if (film->resolution() != resolution()) {
-		if (resolution() == RESOLUTION_4K) {
+		if (resolution() == Resolution::FOUR_K) {
 			/// TRANSLATORS: this string will follow "Cannot reference this DCP: "
 			why_not = _("it is 4K and the film is 2K.");
 		} else {
@@ -690,7 +695,7 @@ DCPContent::can_reference_audio (shared_ptr<const Film> film, string& why_not) c
 {
 	shared_ptr<DCPDecoder> decoder;
 	try {
-		decoder.reset (new DCPDecoder (film, shared_from_this(), false, film->tolerant(), shared_ptr<DCPDecoder>()));
+		decoder = make_shared<DCPDecoder>(film, shared_from_this(), false, film->tolerant(), shared_ptr<DCPDecoder>());
 	} catch (dcp::ReadError &) {
 		/* We couldn't read the DCP, so it's probably missing */
 		return false;
@@ -725,7 +730,7 @@ DCPContent::can_reference_text (shared_ptr<const Film> film, TextType type, stri
 {
 	shared_ptr<DCPDecoder> decoder;
 	try {
-		decoder.reset (new DCPDecoder (film, shared_from_this(), false, film->tolerant(), shared_ptr<DCPDecoder>()));
+		decoder = make_shared<DCPDecoder>(film, shared_from_this(), false, film->tolerant(), shared_ptr<DCPDecoder>());
 	} catch (dcp::ReadError &) {
 		/* We couldn't read the DCP, so it's probably missing */
 		return false;
@@ -735,18 +740,18 @@ DCPContent::can_reference_text (shared_ptr<const Film> film, TextType type, stri
 	}
 
         for (auto i: decoder->reels()) {
-                if (type == TEXT_OPEN_SUBTITLE) {
+                if (type == TextType::OPEN_SUBTITLE) {
 			if (!i->main_subtitle()) {
 				/// TRANSLATORS: this string will follow "Cannot reference this DCP: "
 				why_not = _("it does not have open subtitles in all its reels.");
 				return false;
 			} else if (i->main_subtitle()->entry_point().get_value_or(0) != 0) {
 				/// TRANSLATORS: this string will follow "Cannot reference this DCP: "
-				why_not = _("one if its subtitle reels has a non-zero entry point so it must be re-written.");
+				why_not = _("one of its subtitle reels has a non-zero entry point so it must be re-written.");
 				return false;
 			}
                 }
-		if (type == TEXT_CLOSED_CAPTION) {
+		if (type == TextType::CLOSED_CAPTION) {
 			if (i->closed_captions().empty()) {
 				/// TRANSLATORS: this string will follow "Cannot reference this DCP: "
 				why_not = _("it does not have closed captions in all its reels.");
@@ -755,7 +760,7 @@ DCPContent::can_reference_text (shared_ptr<const Film> film, TextType type, stri
 			for (auto j: i->closed_captions()) {
 				if (j->entry_point().get_value_or(0) != 0) {
 					/// TRANSLATORS: this string will follow "Cannot reference this DCP: "
-					why_not = _("one if its closed caption has a non-zero entry point so it must be re-written.");
+					why_not = _("one of its closed caption has a non-zero entry point so it must be re-written.");
 					return false;
 				}
 			}
@@ -775,22 +780,20 @@ DCPContent::can_reference_text (shared_ptr<const Film> film, TextType type, stri
 void
 DCPContent::take_settings_from (shared_ptr<const Content> c)
 {
-	shared_ptr<const DCPContent> dc = dynamic_pointer_cast<const DCPContent> (c);
+	auto dc = dynamic_pointer_cast<const DCPContent>(c);
 	if (!dc) {
 		return;
 	}
 
 	_reference_video = dc->_reference_video;
 	_reference_audio = dc->_reference_audio;
-	for (int i = 0; i < TEXT_COUNT; ++i) {
-		_reference_text[i] = dc->_reference_text[i];
-	}
+	_reference_text = dc->_reference_text;
 }
 
 void
 DCPContent::set_cpl (string id)
 {
-	ChangeSignaller<Content> cc (this, DCPContentProperty::CPL);
+	ContentChangeSignaller cc (this, DCPContentProperty::CPL);
 
 	{
 		boost::mutex::scoped_lock lm (_mutex);
@@ -814,9 +817,48 @@ Resolution
 DCPContent::resolution () const
 {
 	if (video->size().width > 2048 || video->size().height > 1080) {
-		return RESOLUTION_4K;
+		return Resolution::FOUR_K;
+	}
+
+	return Resolution::TWO_K;
+}
+
+
+void
+add_fonts_from_examiner(shared_ptr<TextContent> text, vector<vector<shared_ptr<Font>>> const & all_fonts)
+{
+	int reel_number = 0;
+	for (auto reel_fonts: all_fonts) {
+		for (auto font: reel_fonts) {
+			/* Each reel could have its own font with the same ID, so we disambiguate them here
+			 * by prepending the reel number.  We do the same disambiguation when emitting the
+			 * subtitles in the DCP decoder.
+			 */
+			auto font_copy = make_shared<dcpomatic::Font>(*font);
+			font_copy->set_id(id_for_font_in_reel(font->id(), reel_number));
+			text->add_font(font_copy);
+		}
+		++reel_number;
+	}
+
+}
+
+
+string
+id_for_font_in_reel(string id, int reel)
+{
+	return String::compose("%1_%2", reel, id);
+}
+
+
+void
+DCPContent::check_font_ids()
+{
+	if (text.empty()) {
+		return;
 	}
 
-	return RESOLUTION_2K;
+	DCPExaminer examiner(shared_from_this(), true);
+	add_fonts_from_examiner(text.front(), examiner.fonts());
 }