X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp_subtitle_content.cc;h=8de5967efb51421d64240fec484a43da786cbbc8;hb=3144a348751dc0c91ba1d1c7fe6c90127de9ef21;hp=015aebd722c9d973196043f9aafcbb5add93ffaf;hpb=73654117144c6de0ec4efe39ddc88485df546cc9;p=dcpomatic.git

diff --git a/src/lib/dcp_subtitle_content.cc b/src/lib/dcp_subtitle_content.cc
index 015aebd72..8de5967ef 100644
--- a/src/lib/dcp_subtitle_content.cc
+++ b/src/lib/dcp_subtitle_content.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -21,73 +21,109 @@
 #include "font.h"
 #include "dcp_subtitle_content.h"
 #include "film.h"
-#include "subtitle_content.h"
+#include "font_id_allocator.h"
+#include "text_content.h"
 #include <dcp/raw_convert.h>
 #include <dcp/interop_subtitle_asset.h>
 #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 (shared_ptr<const Film> film, boost::filesystem::path path)
-	: Content (film, path)
+DCPSubtitleContent::DCPSubtitleContent (boost::filesystem::path path)
+	: Content (path)
 {
-	subtitle.reset (new SubtitleContent (this));
+	text.push_back (make_shared<TextContent>(this, TextType::OPEN_SUBTITLE, TextType::OPEN_SUBTITLE));
 }
 
-DCPSubtitleContent::DCPSubtitleContent (shared_ptr<const Film> film, cxml::ConstNodePtr node, int version)
-	: Content (film, node)
+DCPSubtitleContent::DCPSubtitleContent (cxml::ConstNodePtr node, int version)
+	: Content (node)
 	, _length (node->number_child<ContentTime::Type> ("Length"))
 {
-	subtitle = SubtitleContent::from_xml (this, node, version);
+	list<string> notes;
+	text = TextContent::from_xml (this, node, version, notes);
 }
 
 void
-DCPSubtitleContent::examine (shared_ptr<Job> job)
+DCPSubtitleContent::examine (shared_ptr<const Film> film, shared_ptr<Job> job)
 {
-	Content::examine (job);
+	Content::examine (film, job);
 
-	shared_ptr<dcp::SubtitleAsset> sc = load (path (0));
+	auto subtitle_asset = 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>(subtitle_asset);
+	auto smpte = dynamic_pointer_cast<dcp::SMPTESubtitleAsset>(subtitle_asset);
 	if (smpte) {
-		set_video_frame_rate (smpte->edit_rate().numerator);
+		set_video_frame_rate(film, smpte->edit_rate().numerator);
 	}
 
 	boost::mutex::scoped_lock lm (_mutex);
 
 	/* Default to turning these subtitles on */
-	subtitle->set_use (true);
+	only_text()->set_use (true);
 
-	if (iop) {
-		subtitle->set_language (iop->language ());
-	} else if (smpte) {
-		subtitle->set_language (smpte->language().get_value_or (""));
-	}
+	_length = ContentTime::from_seconds(subtitle_asset->latest_subtitle_out().as_seconds());
+
+	subtitle_asset->fix_empty_font_ids();
+	add_fonts(only_text(), subtitle_asset);
+}
+
+
+void
+DCPSubtitleContent::add_fonts(shared_ptr<TextContent> content, shared_ptr<dcp::SubtitleAsset> subtitle_asset)
+{
+	FontIDAllocator font_id_allocator;
 
-	_length = ContentTime::from_seconds (sc->latest_subtitle_out().as_seconds ());
+	for (auto node: subtitle_asset->load_font_nodes()) {
+		font_id_allocator.add_font(0, subtitle_asset->id(), node->id);
+	}
+	font_id_allocator.allocate();
+
+	auto font_data = subtitle_asset->font_data();
+	for (auto node: subtitle_asset->load_font_nodes()) {
+		auto data = font_data.find(node->id);
+		shared_ptr<dcpomatic::Font> font;
+		if (data != font_data.end()) {
+			font = make_shared<Font>(
+				font_id_allocator.font_id(0, subtitle_asset->id(), node->id),
+				data->second
+				);
+		} else {
+			font = make_shared<Font>(
+				font_id_allocator.font_id(0, subtitle_asset->id(), node->id)
+				);
+		}
+		content->add_font(font);
+	}
 
-	BOOST_FOREACH (shared_ptr<dcp::LoadFontNode> i, sc->load_font_nodes ()) {
-		subtitle->add_font (shared_ptr<Font> (new Font (i->id)));
+	if (!font_id_allocator.has_default_font()) {
+		content->add_font(make_shared<dcpomatic::Font>(font_id_allocator.default_font_id(), default_font_file()));
 	}
 }
 
+
 DCPTime
-DCPSubtitleContent::full_length () const
+DCPSubtitleContent::full_length (shared_ptr<const Film> film) const
 {
-	FrameRateChange const frc (active_video_frame_rate(), film()->video_frame_rate());
+	FrameRateChange const frc (film, shared_from_this());
 	return DCPTime (_length, frc);
 }
 
+DCPTime
+DCPSubtitleContent::approximate_length () const
+{
+	return DCPTime (_length, FrameRateChange());
+}
+
 string
 DCPSubtitleContent::summary () const
 {
@@ -101,13 +137,13 @@ DCPSubtitleContent::technical_summary () const
 }
 
 void
-DCPSubtitleContent::as_xml (xmlpp::Node* node) const
+DCPSubtitleContent::as_xml (xmlpp::Node* node, bool with_paths) const
 {
 	node->add_child("Type")->add_child_text ("DCPSubtitle");
-	Content::as_xml (node);
+	Content::as_xml (node, with_paths);
 
-	if (subtitle) {
-		subtitle->as_xml (node);
+	if (only_text()) {
+		only_text()->as_xml (node);
 	}
 
 	node->add_child("Length")->add_child_text (raw_convert<string> (_length.get ()));