X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fdcp_content.cc;h=62b74be90cb7765db19ad34a2ad51656da271abf;hp=b521234fcacbc1a8a87c472a7f743b08ea7995f4;hb=203ae58ace6f8ff2acddb15f299d0f6dc82ff7f8;hpb=5fa04f74b6ac83fe985f9c64ce069151d560dbae

diff --git a/src/lib/dcp_content.cc b/src/lib/dcp_content.cc
index b521234fc..62b74be90 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-2022 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -20,19 +20,19 @@
 
 
 #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 "text_content.h"
+#include "video_content.h"
 #include <dcp/dcp.h>
 #include <dcp/raw_convert.h>
 #include <dcp/exceptions.h>
@@ -95,7 +95,7 @@ DCPContent::DCPContent (boost::filesystem::path p)
 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);
 	list<string> notes;
 	text = TextContent::from_xml (this, node, version, notes);
@@ -176,10 +176,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;
 		}
 	}
@@ -203,9 +203,11 @@ DCPContent::read_sub_directory (boost::filesystem::path p)
 		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())) {
+		} else if (boost::filesystem::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>(boost::filesystem::status(i.path()).type()));
 		}
 	}
 }
@@ -268,6 +270,7 @@ DCPContent::examine (shared_ptr<const Film> film, shared_ptr<Job> job)
 	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);
 	}
 
@@ -690,7 +693,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 +728,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;
@@ -820,3 +823,41 @@ DCPContent::resolution () const
 	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.
+			 */
+			font->set_id(id_for_font_in_reel(font->id(), reel_number));
+			text->add_font(font);
+		}
+		++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;
+	}
+
+	DCPExaminer examiner(shared_from_this(), true);
+	add_fonts_from_examiner(text.front(), examiner.fonts());
+}
+